merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 22 Aug 2012 09:03:03 +0000 (18:03 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 22 Aug 2012 09:03:03 +0000 (18:03 +0900)

Trivial merge