[mozc/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[Akira TAGOH]

commit 7eb6ee68784905fcb4b87b34d9841df5201bcce9
Merge: a3ae14e be14eef
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Jun 5 20:23:03 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17

 .gitignore                  |    1 +
 mozc-support-new-ibus.patch |   12 +++++++-----
 mozc.spec                   |    8 +++++++-
 sources                     |    6 +++---
 4 files changed, 18 insertions(+), 9 deletions(-)
---