- updated the branch with the changes in the trunk
Authored by: thzs 2006-10-23
Parent: [r238]
Child: [r240]