Commit f207e4ab05d33c33418ca71dbe32206d5cb8a730

fukuchi 2009-05-18T10:51:55

Merged from 3.1.0 branch.