From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 12 Mar 2012 08:10:13 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P269~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0e5e0889e4e1eab28d0730f4221b1b01d6eb96a;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: 4f5daf65lXkJV5QBWgHcELZ4BawiQg
---

e0e5e0889e4e1eab28d0730f4221b1b01d6eb96a