merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 Aug 2010 06:15:12 +0000 (15:15 +0900)
commit38cc06d9c47e11c8cddfa39c3e09c18bc33071f3
treeef1941fcb685e93f2591def428496b436fe67617
parent4e603db3429957e6b26953c177f00a9c9d1c8766
parent9bbaf4b01d0c95215fca22d2808ed0dd5466cae1
merge trunk