2008-10-10 [colin] 3.6.1cvs2