7b5e801 Merge branch 'master' into f18

Merged and Committed by Rex Dieter 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	kdegraphics.spec
    
        
file modified
+17 -5