2006-10-06 [colin] 2.5.3cvs12