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

[Rex Dieter]

commit 8b7f4edf5c9a1c5af61b612985c01c4ef0c6e70a
Merge: 4ca14f0 a1c9bc8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 16:44:54 2012 -0500

    Merge branch 'master' into f16

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