2006-10-08 [colin] 2.5.3cvs22