From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 26 Mar 2004 20:45:51 +0000 (-0500)
Subject: Merge pogo:/usa/mayer/ntp-dev-io
X-Git-Tag: NTP_4_2_3~174^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dfa25f3ba778e38448297fc154cec3bfbb14a5a;p=thirdparty%2Fntp.git

Merge pogo:/usa/mayer/ntp-dev-io
into whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4064967fY3LFC5TXhK-zDR0w6XySFA
---

6dfa25f3ba778e38448297fc154cec3bfbb14a5a