Merge remote-tracking branch 'origin/cmetcalf/tile_epoll_pwait'
authorRoland McGrath <roland@hack.frob.com>
Mon, 30 Jan 2012 17:50:40 +0000 (09:50 -0800)
committerRoland McGrath <roland@hack.frob.com>
Mon, 30 Jan 2012 17:50:40 +0000 (09:50 -0800)
commitee3c3be688072b7d8808034f1d895eabe560274b
tree64f115681766d8165b28b02088b53876324e4a37
parentde9298c991eba226e15e99f39f2d66bd4d219f62
parent463de8625241174b25e339c119d7c59e79b474ec
Merge remote-tracking branch 'origin/cmetcalf/tile_epoll_pwait'

Conflicts:
ChangeLog
ChangeLog