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

[Akira TAGOH]

commit cae4d4ffa3597b96e266ce7f18d501393e5fdb3d
Merge: 05acd92 1b4f292
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Dec 2 13:13:37 2011 +0900

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

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