[openmpi/f15] (4 commits) ...Merge branch 'master' into f15

[Doug Ledford]

Summary of changes:

  b3c3d23... Add new modulefile in mpi directory to make sorting out mpi (*)
  b010d4a... Add new modulefile in mpi directory to make sorting out mpi (*)
  dcc7fb2... Merge branch 'master' of ssh://pkgs.fedoraproject.org/openm (*)
  96c6186... Merge branch 'master' into f15

(*) This commit already existed in another branch; no separate mail sent