From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 30 Jun 2003 08:37:42 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_0~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c71148dcd089d37d16d0cf0fe7350ece994ba03c;p=thirdparty%2Fntp.git

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

bk: 3efff6d6gsElNsFIR-bQnGU8q4ub4w
---

c71148dcd089d37d16d0cf0fe7350ece994ba03c