From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 21 Mar 2012 05:52:12 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P269~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea913800bb38b35d66993cdb917b48882e8d558;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 4f696c8caZnK-17jfpd5gTMhYMVO3A
---

4ea913800bb38b35d66993cdb917b48882e8d558