refs 6007 delete flash
Merge branch 'master' of github.com:nakamura-akifumi/enju_trunk