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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e927e183d4d4e0d0a9f8b54635fbc2eeede8367;p=thirdparty%2Fntp.git

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

bk: 4c8bf687EFWXENHz-j7h33RE39xiiA
---

4e927e183d4d4e0d0a9f8b54635fbc2eeede8367