From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 24 Feb 2011 09:42:57 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1837
X-Git-Tag: NTP_4_2_7P134~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3a48d14dd6d61c8334d5f7e7a7782780e30957;p=thirdparty%2Fntp.git

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

bk: 4d662821mUZvf5B4bOKVQ9rR_WMsag
---

de3a48d14dd6d61c8334d5f7e7a7782780e30957