Commit d725a78369a4914ec641564d7de8a22c32442655

fukuchi 2009-05-13T12:26:05

Merged from 3.1.0.