From: Dave Hart <hart@ntp.org>
Date: Wed, 26 Jan 2011 03:09:04 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1794-95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7027516eabfbbd1d415b012ac97ed89434cd8a9c;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1794-95
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-tvalops

bk: 4d3f9050mYau4vLEqa6uo7g0TLvrxA
---

7027516eabfbbd1d415b012ac97ed89434cd8a9c