From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Feb 2012 09:46:25 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:../hart/ntp-dev-keyid-scaling
X-Git-Tag: NTP_4_2_7P262~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bf8f41093e82f546ca1d61a75a87d220c427aa5;p=thirdparty%2Fntp.git

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

bk: 4f4ca271Bmr2fiQ4kb99gjBW5CvTxA
---

3bf8f41093e82f546ca1d61a75a87d220c427aa5