The latest fixes to the development branch.
Authored by: wackston2 2003-12-13
Parent: [r2108]
Child: [r2110]