shortly) to record the merge history for bringing stuff over from the hetero branch. This commit was SVN r5559.