From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 17 Jun 2006 22:45:12 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f295436c03a9cb0eba6d7beb7fb9c7fc2756fce;p=thirdparty%2Fntp.git

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

bk: 449485f857vJbwoxyIjC0nQtlcWncA
---

7f295436c03a9cb0eba6d7beb7fb9c7fc2756fce