e887af8 Merge branch 'f14'

Merged and Committed by dchen 12 years ago
    Merge branch 'f14'
    
    Conflicts:
    	ibus-chewing.spec
    
        
file modified
+1 -0
file modified
+55 -18
file modified
+1 -1