From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Oct 2006 09:38:25 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3649e80491e367ef60458a83ec89d0a6654d082f;p=thirdparty%2Fntp.git

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

bk: 4528c711RbLWSIdkQFn-wy2hbTW6Ww
---

3649e80491e367ef60458a83ec89d0a6654d082f