From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 17 Aug 2007 09:34:40 +0000 (-0400)
Subject: Merge bk://ntp.bkbits.net/ntp-stable
X-Git-Tag: NTP_4_2_5P69~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2e341c7cc9425047fb527c370d9e5dcf4e16ef;p=thirdparty%2Fntp.git

Merge bk://ntp.bkbits.net/ntp-stable
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-stable

bk: 46c56bb0bSWwQzCCqe-zPTwppOanCw
---

8d2e341c7cc9425047fb527c370d9e5dcf4e16ef