[mozc/f17: 7/20] Merge remote-tracking branch 'origin/f18' into f17

[Akira TAGOH]

commit 50d5635a71008f8c5a87dc26985308e216e19f7f
Merge: 2b16d89 c931064
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Jan 28 15:27:59 2013 +0900

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

 ibus-setup-mozc-jp.desktop |    8 +++++
 mozc-fix-dirs.patch        |   20 +++++++-------
 mozc.spec                  |   63 ++++++++++++--------------------------------
 3 files changed, 35 insertions(+), 56 deletions(-)
---