Patch against CVS as of 2003-01-16