From: Dave Hart <hart@ntp.org>
Date: Sat, 18 Apr 2009 13:51:33 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ac57535ff3de85774bdecab3f6a1aaba74b98a9;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1159
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-3-7-8-9

bk: 49e9dae5_jZHg_AOujP_7TNmsSWD7A
---

5ac57535ff3de85774bdecab3f6a1aaba74b98a9