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

[Rex Dieter]

commit 229ff1189a6225a6b14be29b979ef45d49612c52
Merge: 54ad6fc 00f3f8d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:14:18 2012 -0500

    Merge branch 'f18' into f17

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