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-Tag: NTP_4_2_7P125~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf5951b8ba15d15edc7ddf271b4d8f9a654990a9;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
---

bf5951b8ba15d15edc7ddf271b4d8f9a654990a9