2005-04-15 [colin] 1.9.6cvs37