bcd4797389
Merged in from: svn merge -r5506:5553 https://svn.open-mpi.org/svn/ompi/tmp/hetero . This commit was SVN r5552. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r5506 r5553