From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 1 Jan 2011 01:39:20 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1764-murray
X-Git-Tag: NTP_4_2_7P108~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4adb32123d4fa70c0f0f2cad671c287301b2fd21;p=thirdparty%2Fntp.git

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

bk: 4d1e85c8TeZ9PiNIHiHf2pGTqt3jgA
---

4adb32123d4fa70c0f0f2cad671c287301b2fd21