merging changes from BRANCH_paklein_3: revised ResetStep
Authored by: paklein 2004-01-05
Parent: [r723]
Child: [r725]