2007-06-02 [colin] 2.9.2cvs27