refs 4321 correct model name
Merge branch 'master' of github.com:nakamura-akifumi/enju_trunk