From: Dave Hart <hart@ntp.org>
Date: Mon, 6 Dec 2010 08:03:28 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1738
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbc541e04e90e6cdcd77c21576fe1f7b88ce7396;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1738
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1738

bk: 4cfc98d0Jxhs0yufIhXyxKVJRTkEEQ
---

dbc541e04e90e6cdcd77c21576fe1f7b88ce7396