[mozc/f14: 3/3] Merge remote branch 'origin/f15' into f14

[Akira TAGOH]

commit 73ad571047f6e1a7c3a92425c3e153667c4b62c6
Merge: bdc0e27 ec6b5c4
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Jul 11 20:47:11 2011 +0900

    Merge remote branch 'origin/f15' into f14

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