From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 26 Jun 2006 00:46:46 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-stable
X-Git-Tag: NTP_4_2_2P3_RC0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf80d967d0121a061426403b0a99c7f699528016;p=thirdparty%2Fntp.git

Merge whimsy:/backroom/ntp-stable
into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

bk: 449f2e76tN7afH_rzr8gjgKTNccqlw
---

cf80d967d0121a061426403b0a99c7f699528016