75e8b87
Merge branch 'master' into 4.0 - Enable PVFS2/OrangeFS MPI-IO support (bug #1655010) - Enable mpi1 compatibility Conflicts: openmpi.spec