2006-12-12 [colin] 2.6.1cvs23