Setting up merge tracking for mpl1 branch
Authored by: mdboom 2010-07-06
Parent: [r8515]
Child: [r8517]