Patch by Anders Larsen, 29 Apr 2005 * Fix problems introduced by Patch by Steven Scholz, 02 Mar 2005 (8e2be51de8)
8e2be51de8
Patch by Eric Benard, 07 Apr 2005