Fixing merge tracking from 0.99.x branch
Authored by: mdboom 2010-02-22
Parent: [r8146]
Child: [r8148]
