Speed up patch submitted by Scott Smith (Stefan Fendt was short on free time and
asked that I check the change in for him).
Authored by: sms00 2004-11-23
Parent: [r2502]
Child: [r2504]
