from trunk
authorKenichi Handa <handa@m17n.org>
Wed, 20 Jan 2010 04:01:04 +0000 (13:01 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 20 Jan 2010 04:01:04 +0000 (13:01 +0900)

Trivial merge