2007-01-06 [colin] 2.6.1cvs111