merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:06:14 +0000 (15:06 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:06:14 +0000 (15:06 +0900)
commit9bbaf4b01d0c95215fca22d2808ed0dd5466cae1
tree486480b07181d0720d9f28160f77af1cd4de790b
parent9dfdbc0ad57f07e3d1fa810b62217a79d34fd54d
parent1e5c1c80765a2cb7c973685703422f29afe27a8a
merge trunk