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)
commit69c41c4070c86baac11a627e9c3d366420aeb7cc
treee07fda92570b5e4f264c9a7869b57960940008f0
parent8c536f15bf95916d56bb50495d22b7da7e09fff9
parent758e556a7ab8f61c007e34310ba399a9aaf15362
merge trunk