am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately...

am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo

Merge commit '89e28cbe' into kraken

* commit '89e28cbe':
  Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.