merge trunk
commitd23ab8e8726ecb7e3554644857b4a58e5f7408f1
authorKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 07:57:14 +0000 (28 16:57 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 28 Dec 2011 07:57:14 +0000 (28 16:57 +0900)
treeba4fe863ba0f86637e7549cc07314b564f9095bc
parent0e5317f7e42c1008c40305a94afcdff509a475be
parent8d80ef01d987f052dc8ee641cc65189299e230de
merge trunk