From: Dave Hart <hart@ntp.org>
Date: Fri, 18 Dec 2009 06:42:22 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18
X-Git-Tag: NTP_4_2_7P2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfa53f3359fbfe575c9253b8617daa588674ec8e;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-updatepoint-1412-13-14-18-19

bk: 4b2b244eOJXkSSzJpe4nGQwqVnjGzA
---

cfa53f3359fbfe575c9253b8617daa588674ec8e