From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 31 Jul 2003 02:47:39 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec295a4c3253be019865a740e66c723f11aeed7;p=thirdparty%2Fntp.git

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

bk: 3f28834bXo3paqcckJhnCOognakNxA
---

4ec295a4c3253be019865a740e66c723f11aeed7