[kphotoalbum/f14/master: 3/3] Merge commit 'origin/f15/master~1' into f14/master

[Rex Dieter]

commit 2b92e9879ca8ab55197e0ed115d3ddd27ac3ed66
Merge: 58647d3 9cbe0db
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 30 08:25:59 2011 -0500

    Merge commit 'origin/f15/master~1' into f14/master

 kphotoalbum-4.1.1-exiv2_021.patch |   47 +++++++++++++++++++++++++++++++++++++
 kphotoalbum.spec                  |    9 ++++++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---