2006-12-14 [colin] 2.6.1cvs35