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

[nucleo]

commit 25dec202cb56aba309713a9e6ad197d06f3787af
Merge: e77575e 1056ea9
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Dec 6 01:57:20 2011 +0200

    Merge branch 'master' into f16

 .gitignore                        |    2 +
 digikam-2.3.0-hicolor-icons.patch |  162 -------------------------------------
 digikam-2.3.0-tooltips.patch      |   26 ------
 digikam.spec                      |   22 ++----
 sources                           |    2 +-
 5 files changed, 9 insertions(+), 205 deletions(-)
---