[emacs-ibus/f17: 3/3] Merge branch 'master' into f17

[Daiki Ueno]

commit 9cb7a05fd3d03d2cb01990a55822302d02834d1c
Merge: 5636b2a 778c11d
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Jun 28 15:52:00 2012 +0900

    Merge branch 'master' into f17

 emacs-ibus.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---