merging changes from BRANCH_penetration_2: pass command line options to constructor
Authored by: paklein 2004-06-26
Parent: [r819]
Child: [r821]