[openmpi/f15: 4/4] Merge branch 'master' into f15

[Doug Ledford]

commit 96c6186fc4d3f31a9402a224dd1572fc56efbe14
Merge: f79769a dcc7fb2
Author: Doug Ledford <dledford at redhat.com>
Date:   Fri Jan 20 11:38:41 2012 -0500

    Merge branch 'master' into f15

 openmpi.module.in |    3 ++-
 openmpi.spec      |   13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)
---