Oh, and note that you have an unresolved conflict in this patch!


On Dec 9, 2013, at 5:38 AM, Adrian Reber <adrian@lisas.de> wrote:

diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c
index dd539cd..b91f4a3 100644
--- a/orte/mca/rml/oob/rml_oob_component.c
+++ b/orte/mca/rml/oob/rml_oob_component.c
@@ -11,11 +11,7 @@
 * Copyright (c) 2004-2005 The Regents of the University of California.
 *                         All rights reserved.
 * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
-<<<<<<< .mine
- * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
-=======
 * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
->>>>>>> .r28253
 *                         All rights reserved.
 * $COPYRIGHT$
 *