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

[Akira TAGOH]

commit 05acd9259a1593e61af3f3f0d2a0b1701b161433
Merge: 1806800 81107f9
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Nov 29 16:57:22 2011 +0900

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore |    2 ++
 mozc.spec  |   13 +++++++++++--
 sources    |    2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)
---