f212597 Merge branch 'master' into f12

Merged and Committed by Daiki Ueno 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	ibus-hangul.spec
    
        
file added
+154
file modified
+6 -1