From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Jul 2006 05:13:15 +0000 (-0400)
Subject: Merge bk://maccarony/ntp-stable
X-Git-Tag: NTP_4_2_2P3_RC0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6b791bd5cc116b7ec9dcac26d9bc20a6b00d945;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-stable
into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

bk: 44bdbf6bXumVWH7Rp77mh7fiG88fdQ
---

a6b791bd5cc116b7ec9dcac26d9bc20a6b00d945