2005-05-04 [colin] 1.9.6cvs50