[kdegraphics-thumbnailers/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit 40c0e12e2ef602c91f5d5a974d069e4d1aa40d49
Merge: 41b5377 8edf4aa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 17:57:43 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdegraphics-thumbnailers.spec
    	sources

 .gitignore                    |    7 +------
 kdegraphics-thumbnailers.spec |   21 ++++++++++++++++++---
 sources                       |    2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)
---