From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 4 Feb 2007 22:45:25 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d57136bc6930992d265309349d44950403d69fa0;p=thirdparty%2Fntp.git

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

bk: 45c66205-aeMPlhK6CGzgkJvv6v7sw
---

d57136bc6930992d265309349d44950403d69fa0