Patch supplied by Mike Dubman to support mvapich 2.0rc1