[digikam/f16: 3/3] Merge branch 'master' into f16

[nucleo]

commit 3a9985806d13704e766aa3b5e4b6886751c761c6
Merge: d576933 bae5ed3
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 18:27:30 2012 +0200

    Merge branch 'master' into f16

 digikam-2.5.0-libkipi-1.4.0.patch |   68 +++++++++++++++++++++++++++++++++++++
 digikam.spec                      |    5 +++
 2 files changed, 73 insertions(+), 0 deletions(-)
---