2008-11-12 [colin] 3.6.1cvs23