b1cd795 Merge commit 'origin/f15/master~1' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge commit 'origin/f15/master~1' into f14/master
    
    Conflicts:
    	.gitignore
    	kdevelop.spec
    	sources
    
        
file modified
+1 -2
file modified
+30 -12
file modified
+1 -1