Patches for the old regress testsuite