- ported changes up to rev 157 into the trunk
Authored by: thzs 2007-01-10
Parent: [r276]
Child: [r278]