From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 17 Aug 2006 04:55:49 +0000 (-0400)
Subject: Merge pogo:/usa/mayer/ntp-dev
X-Git-Tag: NTP_4_2_3P33~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6afe7903bb9c6bd9345ace264b5abfa75433a23;p=thirdparty%2Fntp.git

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

bk: 44e3f6d5Vz7OElEK7bgxwYqJwM__ug
---

d6afe7903bb9c6bd9345ace264b5abfa75433a23