Merge from trunk

diff --cc src/comm.cc
Simple merge

diff --cc src/comm.h
index f14c3a755df828e733ec8f0df4169a8dcb660001,331def76f0a85e62db961c3b1d9d33352c4532a6..ac63caf6e686346a9ec5c454d951c9173c5df2ac
--- 1/src/comm.h
--- 2/src/comm.h
+++ b/src/comm.h
@@@ -13,8 -11,24 +13,7 @@@
  #define COMMIO_FD_READCB(fd)    (&commfd_table[(fd)].readcb)
  #define COMMIO_FD_WRITECB(fd)   (&commfd_table[(fd)].writecb)
  
 -typedef enum {
 -    COMM_OK = 0,
 -    COMM_ERROR = -1,
 -    COMM_NOMESSAGE = -3,
 -    COMM_TIMEOUT = -4,
 -    COMM_SHUTDOWN = -5,
 -    COMM_IDLE = -6, /* there are no active fds and no pending callbacks. */
 -    COMM_INPROGRESS = -7,
 -    COMM_ERR_CONNECT = -8,
 -    COMM_ERR_DNS = -9,
 -    COMM_ERR_CLOSING = -10,
 -    COMM_ERR_PROTOCOL = -11, /* IPv4 or IPv6 cannot be used on the fd socket */
 -    COMM_ERR__END__ = -999999 /* Dummy entry to make syntax valid (comma on line above), do not use. New entries added above */
 -} comm_err_t;
 -
 -class DnsLookupDetails;
 -typedef void CNCB(int fd, const DnsLookupDetails &dns, comm_err_t status, int xerrno, void *data);
 -
 +typedef void CNCB(Comm::Connection *conn, Vector<Comm::Connection*> *paths, comm_err_t status, int xerrno, void *data);
- 
  typedef void IOCB(int fd, char *, size_t size, comm_err_t flag, int xerrno, void *data);
  
  

diff --cc src/ipcache.cc
Simple merge

diff --cc src/protos.h
Simple merge