275d3e3 Merge branch 'master' into f12

Merged and Committed by dchen 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	ibus-chewing.spec
    	sources
    
        
file modified
+1 -0
file modified
+16 -20
file modified
+1 -1