5fe1d3c Merge remote-tracking branch 'origin/master' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	kdeutils.spec
    
        
file modified
+18 -5