Merge "Recover from socket POLLERR" into lmp-dev
Vinit Deshpande [Tue, 9 Sep 2014 01:26:01 +0000 (01:26 +0000)]

Trivial merge