2007-01-02 [colin] 2.6.1cvs93