2005-04-08 [colin] 1.9.6cvs29