2006-06-28 [wwp] 2.3.1cvs35