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

[Rex Dieter]

commit 8375c5774bf6e5b855532b1a77d9d7a996706515
Merge: ff85ed0 e44d1fe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 09:55:46 2012 -0500

    Merge branch 'f17' into f16

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