From: Dave Hart <hart@ntp.org>
Date: Sun, 9 Jan 2011 20:21:24 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
X-Git-Tag: NTP_4_2_7P116~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12acdf55654c910d37a0e71bc95e48e8675a2a3d;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-perlinger-nmea

bk: 4d2a18c4wLZIheqc_B6LqeF03gt3Nw
---

12acdf55654c910d37a0e71bc95e48e8675a2a3d