Merged in changes from main branch to improve logging.
Authored by: wackston 2001-04-28
Parent: [r434]
Child: [r436]