[emacs-ibus/f16: 5/5] Merge branch 'master' into f16

[Daiki Ueno]

commit fcff3c5f473b4775e09789dda1aeda13d810c1dc
Merge: 419f41e 778c11d
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Jun 28 15:59:33 2012 +0900

    Merge branch 'master' into f16

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