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

[nucleo]

commit 4e3360699d834174a996168f4f143240f1bd79a8
Merge: 1c769cf 628e2bd
Author: nucleo <nucleo at fedoraproject.org>
Date:   Sat Oct 8 02:42:50 2011 +0300

    Merge branch 'master' into f16

 .gitignore                               |    1 +
 digikam-2.1.0-libkvkontakte-libdir.patch |   22 -----------------
 digikam.spec                             |   37 +++++++++++++++++++++---------
 sources                                  |    2 +-
 4 files changed, 28 insertions(+), 34 deletions(-)
---