[ibus: 3/3] Merge branch 'f16'

[Takao Fujiwara]

commit 0d7928e0b74017404b670dfbf55410affae1d4fe
Merge: 66b985b 5f53fe6
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Fri Oct 28 18:45:32 2011 +0900

    Merge branch 'f16'
    
    Conflicts:
    	ibus.spec

 .gitignore                  |    2 +
 ibus-541492-xkb.patch       |   22 ++--
 ibus-HEAD.patch             |  248 ++++++++++++++++++++++++++++-
 ibus-xx-bridge-hotkey.patch |  372 +++++++++++++++++++++++++++++++++++++------
 ibus.spec                   |   17 ++-
 sources                     |    4 +-
 6 files changed, 595 insertions(+), 70 deletions(-)
---