ca11e26 Merge branch 'master' into f14

Merged and Committed by rdieter 13 years ago
1 file changed. 160 lines added. 39 lines removed.
    Merge branch 'master' into f14
    
    Conflicts:
    	kdeutils.spec
    
        
file modified
+160 -39