[Fedora-i18n-bugs] [ibus-fep/f17: 3/3] Merge branch 'master' into f17

[Daiki Ueno]

commit 5093a10b6b4c8ce4acf3a38531de52ec1ff7c94f
Merge: bd21a2a b572ab7
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon Mar 26 17:17:08 2012 +0900

    Merge branch 'master' into f17

 ibus-fep.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---