593867b Merge remote branch 'origin/f12/master'

Merged and Committed by dwayne 13 years ago
    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec
    
        
file modified
+4 -0