872d956 Merge branch 'master' into f14

Merged and Committed by than 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	kdegraphics.spec
    
        
file modified
+8 -1