2005-04-02 [colin] 1.9.6cvs22