5f8ce57 Merge commit '3dc3dbac4e816d839cfb410f01ab6108c8e4f9a5' into f13/master

Merged and Committed by rdieter 13 years ago
    Merge commit '3dc3dbac4e816d839cfb410f01ab6108c8e4f9a5' into f13/master
    
    Conflicts:
    	kdeedu.spec
    
        
file modified
+1 -0
file modified
+7 -6
file modified
+1 -1