from trunk: if we change the timeouts on bufferevents, we might have to readd pending events svn:r912