2006-12-19 [colin] 2.6.1cvs54