This commit was SVN r6327.
Merged in from: svn merge -r5448:5496 https://svn.open-mpi.org/svn/ompi/tmp/hetero . This commit was SVN r5550. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r5448 r5496