2006-12-06 [colin] 2.6.1cvs7