892fd99 Merge remote-tracking branch 'origin/master' into f14

Merged and Committed by Jaroslav Reznik 13 years ago
    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdeartwork.spec
    	sources
    
        
file modified
+1 -1
file modified
+24 -26
file modified
+1 -1