Add merge tracking to the mathtex branch.
Authored by: evilguru 2009-07-16
Parent: [r7263]
Child: [r7265]
