From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 13 Jun 2003 01:28:30 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev-io into whimsy.udel.edu:/backroom/ntp-dev
X-Git-Tag: NTP_4_1_80_RC1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896bbd7747ae8326b33fb8fc72a7f8d6c72f7ca2;p=thirdparty%2Fntp.git

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

bk: 3ee928beHRB6bg2sht22rro11TXPDA
---

896bbd7747ae8326b33fb8fc72a7f8d6c72f7ca2