1887140 Merge branch 'master' into f17

Merged and Committed by rdieter 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kolourpaint.spec
    	sources
    
        
file modified
+1 -2
file modified
+20 -5
file modified
+1 -1