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

[nucleo]

commit d5769337025776cdbe8bb47b39599c35d4dd6c49
Merge: 25dec20 c5cb927
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 17:02:03 2012 +0200

    Merge branch 'master' into f16

 .gitignore                                         |    1 +
 digikam-2.4.1-dngconverter_hicolor_icons.patch     |   18 ++++++++++++++++++
 ...tlas.patch => digikam-2.5.0-clapack-atlas.patch |   13 ++++++-------
 digikam.spec                                       |   19 ++++++++++++++++---
 sources                                            |    2 +-
 5 files changed, 42 insertions(+), 11 deletions(-)
---