Merged in changes accumulated in stable branch.
Authored by: wackston 2001-06-09
Parent: [r550]
Child: [r552]