2005-04-30 [colin] 1.9.6cvs47