From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 13 Jun 2006 08:50:52 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab518ded46182ac1e28ac63e1a0bc45ffe087684;p=thirdparty%2Fntp.git

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

bk: 448e7c6c2x9aS4Zs-5V1Mx9Nk69mbg
---

ab518ded46182ac1e28ac63e1a0bc45ffe087684