Brought into sync with the current state of the software.
Authored by: wackston2 2001-12-11
Parent: [r1045]
Child: [r1047]