From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 23 Dec 2010 21:03:19 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-ntpq-amp
X-Git-Tag: NTP_4_2_7P103~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abdb776b39ca8bf167e0ea209b42c5fec21f2e11;p=thirdparty%2Fntp.git

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

bk: 4d13b917DuNh-PU-l4J-MsBb0tNhpA
---

abdb776b39ca8bf167e0ea209b42c5fec21f2e11