merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 16 Aug 2012 12:25:17 +0000 (21:25 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 16 Aug 2012 12:25:17 +0000 (21:25 +0900)

Trivial merge