2006-10-07 [colin] 2.5.3cvs20