[libkdcraw/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 42cf098b7188a1ba9007148df36385ffae7d8f7c
Merge: cdeb9e3 297f6e5
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:43:48 2012 +0100

    Merge branch 'f18' into f17

 .gitignore     |    4 +---
 libkdcraw.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---