- ported all changes up to rev 186 into the trunk
Authored by: thzs 2007-02-02
Parent: [r315]
Child: [r317]