From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Apr 2011 07:57:19 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P160~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0cc96184b609589dc7a9b7fec59e4770cf8c7a;p=thirdparty%2Fntp.git

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

bk: 4da405dfAPVLEARQt_JdUkuU7g1-7g
---

0e0cc96184b609589dc7a9b7fec59e4770cf8c7a