2006-07-05 [wwp] 2.3.1cvs59