2005-03-31 [colin] 1.9.6cvs16