Merge branch 'msgr' into unstable

diff --cc src/msg/SimpleMessenger.cc
index eb487f609362d75e051e475b3c0e5ae873cac852,73374428e300ef863f651cd1b4247a599f21f010..0a74d2dd7d38dedb7d5813c61c4072b949ae1f63
--- 1/src/msg/SimpleMessenger.cc
--- 2/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@@ -895,13 -891,16 +891,18 @@@ int SimpleMessenger::Pipe::accept(
    pipe_lock.Unlock();
    return 0;   // success.
  
- 
   fail_unlocked:
 +  if (existing)
 +    existing->pipe_lock.Unlock();
    pipe_lock.Lock();
-   state = STATE_CLOSED;
+   bool queued = is_queued();
+   if (queued)
+     state = STATE_CONNECTING;
+   else
+     state = STATE_CLOSED;
    fault();
+   if (queued)
+     start_writer();
    pipe_lock.Unlock();
    return -1;
  }