From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 2 Oct 2010 07:50:48 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P59~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5f15bd16a4d69ac3474b80821268a7494c96260;p=thirdparty%2Fntp.git

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

bk: 4ca6e458j5p9jedlPsd6zrZ9AXg5Ew
---

d5f15bd16a4d69ac3474b80821268a7494c96260