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

[Daiki Ueno]

commit fff3140c03e67bfaefbba71fb51ab66d8e400d56
Merge: 0a6096e d2512db
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Dec 6 16:49:40 2011 +0900

    Merge branch 'master' into f15

 ibus-m17n-custom-setup-element.patch |   49 ++++++++++++++++++++++++++++++++++
 ibus-m17n.spec                       |    9 +++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---