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

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

bk: 4b2b2351CTtrQdQski9rP17NgfaJbw
---

eaa329efe037fef8b27d2391a3363ea130b82b70