49aff8e Merge branch 'f18' into f17

Merged and Committed by rdieter 11 years ago
    Merge branch 'f18' into f17
    
    Conflicts:
    	kdegraphics.spec
    
        
file modified
+24 -3