From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 28 Jul 2011 06:45:18 +0000 (-0400)
Subject: Merge deacon.udel.edu:/backroom/snaps/ntp-dev
X-Git-Tag: NTP_4_2_7P197~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52b78ba7d3aae9b9c088f5720007eea43e5f3c09;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/backroom/snaps/ntp-dev
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4e31057ejiB9YbpcDckB24XHggBc9Q
---

52b78ba7d3aae9b9c088f5720007eea43e5f3c09