This commit was SVN r9111.
* don't know what I was thinking, but can't use the MCA_PML_CALL macro on the two data values, as they don't have things that the macro can expand into This commit was SVN r6868.