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

[Doug Ledford]

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

    Merge branch 'master' into f16

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