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

[Rex Dieter]

commit 9bfd9ef655e626b67954dc949d4629bdc6c1d8d1
Merge: 41dbccf 6b6b61e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 12:27:25 2011 -0500

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

 .gitignore                |    2 +-
 digikam-1.8.0-gcc46.patch |   16 ----------------
 digikam.spec              |   10 +++++-----
 sources                   |    2 +-
 4 files changed, 7 insertions(+), 23 deletions(-)
---