merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)

Trivial merge