From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 10 Apr 2011 01:53:59 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5cdaed3b79028c91537bf673df5e220dfd9729e;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: 4da10db7QyV3RHJKe5N5U_f1z2GF2w
---

e5cdaed3b79028c91537bf673df5e220dfd9729e