this should have been part of previous commit
Authored by: tmh 2007-12-17
Parent: [r676]
Child: [r678]