From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Apr 2009 22:56:55 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-58-60-mayer
X-Git-Tag: NTP_4_2_5P164~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99393922cf10c2f4386a3ef0379a0bacd5b79558;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-58-60-mayer
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125-52-53-57-58-59-60-mayer

bk: 49ecfdb7SkgvwPeKepM5CAcnOij3ZA
---

99393922cf10c2f4386a3ef0379a0bacd5b79558