Merge branch 'master' of github.com:nakamura-akifumi/enju_trunk into issue5732
Merge branch 'issue5732' of github.com:nakamura-akifumi/enju_trunk into issue5732