2006-10-18 [colin] 2.5.5cvs17