From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 7 Oct 2003 09:59:30 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_2_0~6^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6ec3fe7e3891fa6c52d348c4bbda8cd0e95eac;p=thirdparty%2Fntp.git

Merge

bk: 3f828e82kvMWq8aoNTep6On7raVV1g
---

2c6ec3fe7e3891fa6c52d348c4bbda8cd0e95eac