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)
commitd75ffb4ed0b2e72a9361a07d16a5c884a9459728
tree8ac5a6a8ae033fef7fbc7fb7b09a703ef4b0ed5b
parent69c41c4070c86baac11a627e9c3d366420aeb7cc
parent250c8ab9b8f6322959fa3122db83944c30c3894b
merge trunk