[Fedora-i18n-bugs] [ibus-gucharmap/f15: 4/4] Merge branch 'master' into f15

[Daiki Ueno]

commit 064323444862d5c73ae2f4c236dbd049cb76ce39
Merge: 7dec24b 0a56352
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon Jul 11 18:15:48 2011 +0900

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

 ibus-gucharmap.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---