From: Dave Hart Date: Sat, 10 Apr 2010 03:27:02 +0000 (+0000) Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dc314b6c3c91cabe9f6b5d7e12680725d4500a1;p=thirdparty%2Fntp.git Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518 into shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22 bk: 4bbff006mzJn1pCvHG6UAF9HwHnD7w --- 2dc314b6c3c91cabe9f6b5d7e12680725d4500a1