Make sure we correctly unregister all persistent events

and signal handlers.

This commit was SVN r20568.

orte/orted/orted_main.c

@@ -754,6 +754,14 @@ static void shutdown_callback(int fd, short flags, void *arg)
         exit(ORTE_ERROR_DEFAULT_EXIT_CODE);
     }
 
+    /* Release all local signal handlers */
+    opal_event_del(&term_handler);
+    opal_event_del(&int_handler);
+#ifndef __WINDOWS__
+    opal_signal_del(&sigusr1_handler);
+    opal_signal_del(&sigusr2_handler);
+#endif  /* __WINDOWS__ */
+
     /* Finalize and clean up ourselves */
     ret = orte_finalize();
     exit(ret);

orte/runtime/orte_wait.c

@@ -517,8 +517,8 @@ int orte_wait_event(opal_event_t **event, orte_trigger_event_t *trig,
     /* define the event to fire when someone writes to the pipe */
     opal_event_set(*event, p[0], OPAL_EV_READ, cbfunc, NULL);
     
-	/* Add it to the active events, without a timeout */
-	opal_event_add(*event, NULL);
+    /* Add it to the active events, without a timeout */
+    opal_event_add(*event, NULL);
 
     /* all done */
     return ORTE_SUCCESS;