[digikam/f13/master: 10/10] Merge branch 'master' into f13

[nucleo]

commit 076a9f06a60e26318df59eff1f274fe917405a74
Merge: 6b16e78 6b6b61e
Author: nucleo <nucleo at fedoraproject.org>
Date:   Wed Mar 30 17:13:10 2011 +0300

    Merge branch 'master' into f13

 .gitignore                            |    2 +-
 digikam-1.8.0-libjpeg_version-2.patch |   38 +++++++++++++++++++++++++++++++++
 digikam-1.8.0-libjpeg_version-3.patch |   11 +++++++++
 digikam.spec                          |   18 +++++++++++++--
 sources                               |    2 +-
 5 files changed, 66 insertions(+), 5 deletions(-)
---