From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 7 Jan 2011 04:08:00 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1776
X-Git-Tag: NTP_4_2_7P113~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a28219d6c179a84e97e24041395ac229a0d5bc1;p=thirdparty%2Fntp.git

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

bk: 4d2691a0fkZo2uKIMsjwzFuJLz2UHg
---

5a28219d6c179a84e97e24041395ac229a0d5bc1