From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 2 Jan 2004 21:35:50 +0000 (-0500)
Subject: Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3~189^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af22b3e31c5894b59cdc94e2459c83f1727e5b96;p=thirdparty%2Fntp.git

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

bk: 3ff5e436baeLGe1HRujCj5Ocy43LNw
---

af22b3e31c5894b59cdc94e2459c83f1727e5b96