From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 11 Sep 2010 21:37:11 +0000 (-0400)
Subject: Merge bk1.ntp.org:/home/bk/ntp-dev
X-Git-Tag: NTP_4_2_7P48~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48ea960d7787768bc8692f38782df9e160f34ee;p=thirdparty%2Fntp.git

Merge bk1.ntp.org:/home/bk/ntp-dev
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4c8bf687EFWXENHz-j7h33RE39xiiA
---

f48ea960d7787768bc8692f38782df9e160f34ee