Patch against CVS 2002-09-20