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

[Akira TAGOH]

commit 16bfaa06a4718a14fadbdef87a3d0278bf19b73e
Merge: 7eb6ee6 3a880e8
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Jun 7 21:06:13 2012 +0900

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

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