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

[Akira TAGOH]

commit 42ef082dbc79f2a4d28ac9bcda36a9a0dc2238d8
Merge: 857fe50 16bfaa0
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Jun 7 21:10:38 2012 +0900

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

 mozc.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---