From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 25 Aug 2006 19:08:39 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-stable
X-Git-Tag: NTP_4_2_3P61_RC~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cb9b722b52b53c2909bc7059fd99339252cfa45;p=thirdparty%2Fntp.git

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

bk: 44ef4ab7fYmir5PEx8nOmDWqFfg5Pw
---

9cb9b722b52b53c2909bc7059fd99339252cfa45