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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aede5516a85996bc24312eb1a88cdeda0a8ca445;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
---

aede5516a85996bc24312eb1a88cdeda0a8ca445