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

[nucleo]

commit d99b1b928ce0f53e1fefe5f8c8623694168d52ac
Merge: 3a99858 f53f192
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 20:15:13 2012 +0200

    Merge branch 'master' into f16

 digikam.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---