2006-07-06 [colin] 2.3.1cvs65