modified Tony's patch to coimply w/ mpl properties
Authored by: jdh2358 2009-05-22
Parent: [r7132]
Child: [r7134]