]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1471-72
authorDave Hart <hart@ntp.org>
Mon, 1 Feb 2010 18:26:59 +0000 (18:26 +0000)
committerDave Hart <hart@ntp.org>
Mon, 1 Feb 2010 18:26:59 +0000 (18:26 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1470-71-72

bk: 4b671cf30KDnnoXJTeOm_-DUWkpl5g


Trivial merge