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

[Rex Dieter]

commit e77575e7d1ec22198a18c4b4b1092c608a4ceb99
Merge: 198ad08 9fcb662
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 22 07:29:47 2011 -0600

    Merge branch 'master' into f16

 digikam-2.3.0-tooltips.patch |   26 ++++++++++++++++++++++++++
 digikam.spec                 |   13 ++++++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---