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

[Akira TAGOH]

commit 78f750a658f71a9b9046fb032ea4e06b77f4f6b8
Merge: 5139a04 73d7f14
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Sep 30 20:30:54 2011 +0900

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

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