From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 9 Sep 2006 03:28:37 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0485b2f0894c2db0821032ea82af9bebfd788128;p=thirdparty%2Fntp.git

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

bk: 450234e5CZeokSw5dybMvJHizfsPXA
---

0485b2f0894c2db0821032ea82af9bebfd788128