472aae8 Merge branch 'f18'

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