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

[Akira TAGOH]

commit a4d9a04c765bb1f2d6d980cd686ee3bf8b8a3029
Merge: cabdbf7 78f750a
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Sep 30 20:32:33 2011 +0900

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

 .gitignore |    1 +
 mozc.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---