merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:35:02 +0000 (16:35 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:35:02 +0000 (16:35 +0900)
commitfd294c6932d54a1ce8f56b10468f42bec90c5c74
tree0757e92d0404fa1a017a19d15213482ffb643ffe
parentde62b4dfd0dd8254aee693b3c583386e050fb739
parentc1ec8ad04d002d8d8bc5bf1be208c41e47c8cefb
merge trunk