* Patch by Bernhard Kuhn, 28 Nov 2003: