[Fedora-i18n-bugs] [ibus-hangul/f15: 5/5] Merge branch 'master' into f15

[Daiki Ueno]

commit fa98a30c5bf2e4fc815abac1cb2a023206f0ae52
Merge: b9ed66a 0f5f924
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed May 11 18:32:06 2011 +0900

    Merge branch 'master' into f15
    
    Conflicts:
    	ibus-hangul.spec

 ibus-hangul-gvariant.patch |   92 --------------------------
 ibus-hangul-ibus-1.4.patch |  155 ++++++++++++++++++++++++++++++++++++++++++++
 ibus-hangul.spec           |   21 ++++---
 3 files changed, 167 insertions(+), 101 deletions(-)
---