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

[Rex Dieter]

commit 54ad6fc8b0002a0e3b61de59373c6eb537069150
Merge: e44d1fe dd9320a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:29:18 2012 -0500

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

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