merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 21 Mar 2012 07:43:58 +0000 (16:43 +0900)

Trivial merge