undo changes to other files accidentally committed in r4431
Authored by: mgood 2006-12-09
Parent: [r4431]
Child: [r4433]