From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Jun 2006 07:58:49 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P6~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab068ecd299b7aa73d167027f971fbdd4883b05;p=thirdparty%2Fntp.git

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

bk: 4497aab9A8g2XyKrbH6yCQ_vkx9NbQ
---

0ab068ecd299b7aa73d167027f971fbdd4883b05