2007-01-18 [colin] 2.7.1cvs25