- ported changes up to rev 173 into the trunk
Authored by: thzs 2007-01-27
Parent: [r301]
Child: [r303]