[libkdcraw/f17: 10/10] Merge branch 'master' into f17

[Rex Dieter]

commit d1005ee3f49a1689339629da5f9e4efcab5d018d
Merge: bb284c4 730474d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:23:28 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	libkdcraw.spec
    	sources

 .gitignore     |    3 +--
 libkdcraw.spec |   28 ++++++++++++++++++++++------
 sources        |    2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)
---