[libkipi/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 001b2d33ceb01e8b8ca574a7505609af91c276d6
Merge: 7620382 8ca3903
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:09:20 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	libkipi.spec
    	sources

 .gitignore   |    3 +--
 libkipi.spec |   31 ++++++++++++++++++++++++++-----
 sources      |    2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)
---