a6a4460 Merge branch 'f18' into f17

Merged and Committed by Dan Vrátil 11 years ago
    Merge branch 'f18' into f17
    
    Conflicts:
    	kscreen.spec
    
        
file modified
+1 -0
file modified
+14 -14
file modified
+1 -1