Merging from trunk

svn path=/branches/release/libs/mpi/; revision=84745