From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 12 Oct 2006 05:08:05 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed24c9c90139c11f6dc00fe8ee01f9491a49ffe;p=thirdparty%2Fntp.git

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

bk: 452dcdb5_PvTCT9qWz7M1X1Q5s7iwQ
---

fed24c9c90139c11f6dc00fe8ee01f9491a49ffe