From: Dave Hart <hart@ntp.org>
Date: Wed, 30 Dec 2009 05:53:50 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1446
X-Git-Tag: NTP_4_2_7P7~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14efa325581a20ee741ab9c234cdfd07dbeb2b64;p=thirdparty%2Fntp.git

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

bk: 4b3aeaeebQrhYee6tLqX3aqhOJTuBQ
---

14efa325581a20ee741ab9c234cdfd07dbeb2b64