[mozc/f14: 4/4] Merge remote-tracking branch 'origin/f15' into f14

[Akira TAGOH]

commit 180680065c71a90e21bce81cd59d32396a3b2365
Merge: a4d9a04 4c9d057
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Nov 15 19:39:46 2011 +0900

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore                  |    1 +
 mozc-support-new-ibus.patch |   18 +++++++++---------
 mozc.spec                   |    5 ++++-
 sources                     |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---