merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 16 Jul 2012 22:25:00 +0000 (07:25 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 16 Jul 2012 22:25:00 +0000 (07:25 +0900)

Trivial merge