Initial merge back of update unstable developer branch.
Authored by: wackston 2001-06-09
Parent: [r557]
Child: [r559]