[digikam/f15/master: 2/2] Merge remote-tracking branch 'origin/master' into f15/master

[Rex Dieter]

commit 41dbccf62362a52583cfff0a38f8b478e1eac88e
Merge: 0c194ab dd30ee2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 12:26:28 2011 -0500

    Merge remote-tracking branch 'origin/master' into f15/master

 digikam.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---