2005-04-17 [colin] 1.9.6cvs40