[digikam/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 6f6387ccbe55c1336d41bfe771fea6a1d1851d49
Merge: 0a8eb6d 2632d5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 2 10:21:47 2010 -0500

    Merge remote branch 'origin/master' into f13/master

 digikam.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---