Patch provided by Gilles - reviewed by rhc. RM-approved cmr=v1.8.2:reviewer=ompi-gk1.8 This commit was SVN r31971.