merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 12:36:18 +0000 (21:36 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 28 Jan 2011 12:36:18 +0000 (21:36 +0900)
commit10339fa90363cf20a9e379c083df83405718302d
treebbb9ead7b5605a7aeece27ecc25c9362d4ba9e5c
parent9e269017e71b8a8208cd2d51c90d8fc61e69182d
parent584cbd9e0f31199f589addde5bab5af821afd74c
merge trunk