[mozc/f14: 7/7] Merge remote branch 'origin/f15' into f14

[Akira TAGOH]

commit cabdbf7402442d71d972e5464166a1ad2c930fac
Merge: 975ea4b 5139a04
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Aug 17 20:30:23 2011 +0900

    Merge remote branch 'origin/f15' into f14

 .gitignore                  |    1 +
 mozc-build-verbosely.patch  |   12 ++++++------
 mozc-hotkeys.patch          |   11 -----------
 mozc-support-new-ibus.patch |   21 +++++++++++++++++++++
 mozc.spec                   |    9 ++++++---
 sources                     |    2 +-
 6 files changed, 35 insertions(+), 21 deletions(-)
---