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

[Akira TAGOH]

commit 2f5ca7a9576f09fb056f4037a2b7ed57ba0e6354
Merge: 1b4f292 713786b
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Dec 21 17:46:18 2011 +0900

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

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