2006-12-11 [colin] 2.6.1cvs18