merge trunk
authorKenichi Handa <handa@m17n.org>
Sun, 11 Dec 2011 12:11:01 +0000 (21:11 +0900)
committerKenichi Handa <handa@m17n.org>
Sun, 11 Dec 2011 12:11:01 +0000 (21:11 +0900)
commitd93a1e346748314203e81d68a07fbe3cd727f28f
tree1d8403fdab41635d46227e23a13d537b579f1f84
parent3633e3aa59f8df4e12f1b509c952e17dbf205819
parentd7932d31e3880b3c6fa93231a895ac55da22b944
merge trunk