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

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

bk: 50a8d54e-yz43eLCo9xl-BGRVIHupQ
---

499dd13e30bdb489c496ee1fa64735326cb9b373