2006-09-28 [colin] 2.5.2cvs16