added a switch to select old or new routing approach
Authored by: thibautd 2012-09-17
Parent: [r21043]
Child: [r21045]