[ksnapshot/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit a9202198fec2d4d24afb11bbc0ca797875804650
Merge: 90d331a 3abfb65
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:14:05 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ksnapshot.spec
    	sources

 .gitignore              |    7 +------
 ksnapshot-libkipi.patch |   37 -------------------------------------
 ksnapshot.spec          |   28 ++++++++++++++++++----------
 sources                 |    2 +-
 4 files changed, 20 insertions(+), 54 deletions(-)
---