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

[nucleo]

commit 1c769cfe0ade17ba225d1033eab7b1d766ae9773
Merge: 6d70f1d 5239d57
Author: nucleo <nucleo at fedoraproject.org>
Date:   Wed Sep 28 19:29:36 2011 +0300

    Merge branch 'master' into f16

 .gitignore                        |    3 --
 digikam-2.1.1-clapack-atlas.patch |   42 +++++++++++++++++++++++
 digikam.spec                      |   68 +++++++++++++++++++++++--------------
 3 files changed, 84 insertions(+), 29 deletions(-)
---