Tidying up for release to ensure it builds on "clean" systems.
Authored by: wackston 2000-12-06
Parent: [r205]
Child: [r207]
