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

[Lukas Tinkl]

commit 45df2f029db0b461f618b4352c4797f0c5003aa6
Merge: 79c6684 4ff8eac
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Jan 11 16:48:52 2011 +0100

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

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