[Fedora-i18n-bugs] [ibus-m17n/f15: 3/3] Merge branch 'master' into f15

[Daiki Ueno]

commit 12f3c2944e10b6d2f545ceff488ff6577fa6841f
Merge: b6145e3 db3fcce
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon May 23 10:14:46 2011 +0900

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

 ibus-m17n.spec |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---