refactored names
added stop relocation
Authored by: vsp_neumann 2012-06-13
Parent: [r19897]
Child: [r19899]