Update the mathtex branch so that it is up-to-date with trunk.
Authored by: evilguru 2009-07-29
Parent: [r7305]
Child: [r7307]