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

[Akira TAGOH]

commit 1b4f29275eb97308ac77a5875945196b46175215
Merge: 81107f9 ba4f87c
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Dec 2 12:55:56 2011 +0900

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

 .gitignore                           |    1 +
 mozc-fix-model-path-for-zinnia.patch |    8 ++++----
 mozc.spec                            |    7 +++++--
 sources                              |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---