2005-04-29 [colin] 1.9.6cvs46