[libkipi/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit ff85ed0d9ba4ef5594a16ef493b21b79aed71cc9
Merge: 8b7f4ed af13237
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:31:25 2012 -0500

    Merge branch 'f17' into f16

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