From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 Jun 2006 02:53:09 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=028be6f516d9ff2214e8cf1fb73b6d1d3e167a2a;p=thirdparty%2Fntp.git

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

bk: 4494c015EnR-lJcD46FCYI2TMoMnWA
---

028be6f516d9ff2214e8cf1fb73b6d1d3e167a2a