56021b7 Merge branch 'master' into f14

Merged and Committed by rdieter 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdeartwork.spec
    	sources
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1