cd10143 Merge branch 'master' into f17

Merged and Committed by rdieter 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-l10n.spec
    	sources
    
        
file modified
+110 -55
file modified
+97 -165
file modified
+55 -55
file modified
+1 -1