From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 Nov 2012 12:16:12 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:ntp-dev
X-Git-Tag: NTP_4_2_7P324~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32f289f404a484e56300bd2de555a191f65bd5b6;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:ntp-dev
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 50a8d18cVHzxq3tl6XnMKpc01u2I6g
---

32f289f404a484e56300bd2de555a191f65bd5b6