6e60dcc Merge remote-tracking branch 'origin/master' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore
    	krename.spec
    	sources
    
        
file modified
+4 -0
file modified
+22 -4
file modified
+1 -1