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

[Rex Dieter]

commit 58647d340d80f67e38b5b9fd703c080831af63ae
Merge: cfddef0 707c754
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 11:17:15 2011 -0500

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

 kphotoalbum.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---