From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 23 Oct 2006 06:40:00 +0000 (-0400)
Subject: Merge pogo:ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192d1e38f0f5db581df01a6f21889ed63b0376bb;p=thirdparty%2Fntp.git

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

bk: 453c63c06jKeqP2rS9CG5ko1kQAuUw
---

192d1e38f0f5db581df01a6f21889ed63b0376bb