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

[Rex Dieter]

commit b1df0a7fe413772ab7bcca58c00cb378ac8af3e6
Merge: 6a51214 abacce1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:31:00 2012 -0500

    Merge branch 'f17' into f16

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