Commits


Tweak mpm pending C++ support in the mkfiles.


Checkpoint: pull in mpm; merge pic from Taj's version of the world