[openmpi/f16: 5/6] Merge branch 'master' into f15

[Doug Ledford]

commit 9f81bf3243197edadace28c55d655f153d17d395
Merge: 2866357 6e7bd70
Author: Doug Ledford <dledford at redhat.com>
Date:   Fri Jan 20 10:41:19 2012 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	openmpi.spec

 .gitignore            |    1 +
 openmpi-removed.patch |   33 +++++++++++++++++++++++++++++++
 openmpi.spec          |   52 +++++++++++++++++++++++++++++++++---------------
 sources               |    2 +-
 4 files changed, 71 insertions(+), 17 deletions(-)
---
diff --cc openmpi.spec
index 04d1436,39f5871..da61307
--- a/openmpi.spec
+++ b/openmpi.spec
@@@ -118,8 -121,9 +121,10 @@@ Contains development headers and librar
  
  %prep
  %setup -q -n openmpi-%{version}
- %patch0 -p1 -b .dt-textrel
+ %patch0 -p1 -b .removed
+ # Make sure we don't use the local libltdl library
+ rm -r opal/libltdl
 +./autogen.sh
  
  %build
  %ifarch x86_64