merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 17 Sep 2010 05:07:47 +0000 (14:07 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 17 Sep 2010 05:07:47 +0000 (14:07 +0900)

Trivial merge