From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 9 Oct 2006 00:09:18 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14011b1d44cf04ea86ad9b6b13292548708f0094;p=thirdparty%2Fntp.git

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

bk: 4529932eT_MbHnSkXv5cn_AZowDEMQ
---

14011b1d44cf04ea86ad9b6b13292548708f0094