[libkdcraw/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 81bf0d44b317cb3a1ff72199d67baadbae54e401
Merge: 50f8dee 4082034
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:10:10 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	libkdcraw.spec
    	sources

 .gitignore     |    3 +--
 libkdcraw.spec |   32 ++++++++++++++++++++++++++++----
 sources        |    2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)
---