Try to add merge tracking to the mathtex branch.
Authored by: evilguru 2009-07-29
Parent: [r7304]
Child: [r7306]