Minor tidying pre- merge into the 1_6_STABLE branch...
Authored by: wackston2 2003-01-04
Parent: [r1631]
Child: [r1633]