[kdegraphics-thumbnailers/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit e96737cae6a6be160ba78c9b95159a9f2e13c993
Merge: b7823ac d9557c4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:32:17 2012 -0600

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

 .gitignore                    |    3 +--
 kdegraphics-thumbnailers.spec |   32 ++++++++++++++++++++++++++++----
 sources                       |    2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)
---