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

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

bk: 3ffb85d9kkoLbW1x3-9id00yFdCUOg
---

c314b5a69b8e258e3cc5d055cbc3bf9f66d7869e