[ibus/f20: 2/2] Merge branch 'master' into f20

[Takao Fujiwara]

commit 299a0f2b941d1d1e80479bb95b5e34706f6e57d4
Merge: d8554a2 7c758e4
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Fri Mar 7 16:09:41 2014 +0900

    Merge branch 'master' into f20

 .gitignore                                |    1 +
 ibus-530711-preload-sys.patch             |   16 +-
 ibus-541492-xkb.patch                     |   40 ++--
 ibus-810211-no-switch-by-no-trigger.patch |    2 +-
 ibus-HEAD.patch                           |  529 -----------------------------
 ibus-xx-ctrl-space.patch                  |   33 --
 ibus-xx-setup-frequent-lang.patch         |    4 +-
 ibus.spec                                 |   23 +-
 sources                                   |    2 +-
 9 files changed, 44 insertions(+), 606 deletions(-)
---