Separated yesterdays changes into a define and added the
original code as an option.
Authored by: peschau 2004-06-07
Parent: [r506]
Child: [r508]