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

[Rex Dieter]

commit e94162f0f2391f55ac2de1997438091d079b9225
Merge: 11e49c7 ea47105
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:36:09 2013 -0600

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

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