From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 25 Sep 2010 21:33:47 +0000 (-0400)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P56~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91bcc8a1954dbd969b39547c1a2d9f0c2d9f640b;p=thirdparty%2Fntp.git

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

bk: 4c9e6abbA3QXe32R7qSTN_jBh7ot-g
---

91bcc8a1954dbd969b39547c1a2d9f0c2d9f640b