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

[Akira TAGOH]

commit 2b16d891fd70dd6b432e9a9ced6b1cd71d2ca914
Merge: 16bfaa0 0590deb
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Aug 31 18:39:07 2012 +0900

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

 .gitignore |    1 +
 mozc.spec  |   11 +++++++++--
 sources    |    6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)
---