From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 26 Jun 2006 07:09:48 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P11~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df7ba15f6a625b03ce1671380185c80e0b310f9;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 449f883cA5bffvJRCgkWkoKPQ-yirQ
---

0df7ba15f6a625b03ce1671380185c80e0b310f9