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

[Rex Dieter]

commit 4ca14f0ff0dda8e3009fc7af0d8b266d5a42b092
Merge: 001b2d3 b8be89a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:54:16 2012 -0500

    Merge branch 'master' into f16

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