Revert r20480 as this breaks the trunk. The dpm.h include file has defines for OMPI_RML tags that are required for wireup.

This commit was SVN r20482.

The following SVN revision numbers were found above:
  r20480 --> open-mpi/ompi@62282fefe5

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -31,6 +31,7 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/name_fns.h"
 #include "orte/runtime/orte_globals.h"
+#include "ompi/mca/dpm/dpm.h"
 
 #include "btl_openib.h"
 #include "btl_openib_endpoint.h" 

ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c

@@ -17,6 +17,7 @@
 #include "orte/util/name_fns.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/mca/errmgr/errmgr.h"
+#include "ompi/mca/dpm/dpm.h"
 
 #include "btl_openib.h"
 #include "btl_openib_endpoint.h"

ompi/mca/btl/udapl/btl_udapl_endpoint.c

@@ -36,6 +36,7 @@
 
 #include "ompi/class/ompi_free_list.h"
 #include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/dpm/dpm.h"
 
 #include "ompi/mca/btl/base/btl_base_error.h"
 #include "btl_udapl.h"