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

[nucleo]

commit 95ee2cae93bc628410b0ba7638712f5cf7881b75
Merge: d99b1b9 870a686
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 20:37:33 2012 +0200

    Merge branch 'master' into f16

 digikam.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---