From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 7 Aug 2003 18:53:08 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_0~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b997cbf611d3dca2e32bf022218fea29ded67750;p=thirdparty%2Fntp.git

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

bk: 3f32a014OM1Zw92Kjmx3kTFw-YsOdw
---

b997cbf611d3dca2e32bf022218fea29ded67750