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

[Akira TAGOH]

commit 5b59605c07d598bd79bea479db79effb1f7ccc52
Merge: 9decbd5 5de1a47
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Apr 20 16:03:14 2011 +0900

    Merge remote branch 'origin/f15/master' into f14/master

 mozc-fix-model-path-for-zinnia.patch |   12 ++++++++++++
 mozc.spec                            |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---