[libkdcraw/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit e6d5040b5a5aba3ad5b75e2b960731c458de31df
Merge: 81bf0d4 8249cf5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:53:32 2012 -0500

    Merge branch 'master' into f16

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