final patch against head 2004-07-02