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

[Rex Dieter]

commit 1625c5c917e0f179345da737255ab0a2f4582972
Merge: 0752807 925883e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:54:01 2012 -0500

    Merge branch 'master' into f16

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