2006-08-02 [colin] 2.4.0cvs18