I am not sure if this is directly related to the merge or not, but
these messages now appear periodically:

Feb 11 14:44:00 dexamyl ntpd[227]: sigio_handler: sigio_handler_active != 1
Feb 11 14:44:00 dexamyl ntpd[227]: select(28, ########--------------------, 0L,
0L, &0.0) error: Bad file descriptor
Feb 11 14:44:00 dexamyl ntpd[227]: Bad file descriptor 27
Feb 11 14:44:00 dexamyl ntpd[227]: sigio_handler: sigio_handler_active != 0

--
Support WFMU-FM: free-form radio for the masses!
<http://www.wfmu.org/>

"The frivolity and boredom which unsettle the established order, the
vague foreboding of something unknown, these are the heralds of
approaching change.  The gradual crumbling that left unaltered the the
face of the whole is cut short by a sunburst which, in one flash,
illuminates the features of the new world."  --G.W.F. Hegel,
_Phenomenology of Spirit_ 5:11