Removing this merge branch tracker since it doesn't work
Authored by: mdboom 2008-12-10
Parent: [r6557]
Child: [r6559]
