merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 07:51:01 +0000 (16:51 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 07:51:01 +0000 (16:51 +0900)

Trivial merge