initialized merge tracking on 1.0 branch
Authored by: jdh2358 2010-07-06
Parent: [r8504]
Child: [r8506]
