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

[Rex Dieter]

commit 79c6684759201a71b5c1a0981a15864c201c6dd3
Merge: 6f6387c abc18b3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 29 21:59:55 2010 -0600

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

 .gitignore   |    2 +-
 digikam.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---