057f237 Merge branch 'master' into f12

Merged and Committed by dchen 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	ibus-fbterm.spec
    
        
file modified
+5 -5