c76d67b Merge remote branch 'origin/f14/master' into f13/master

Merged and Committed by rdieter 13 years ago
    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	kdeedu.spec
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1