From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Mar 2012 23:10:03 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P269~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50cb6a3c02abdc4226aedcf7a5b57409c255e262;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 4f6e544bscxx7jVJhkes7wzLiqD7ew
---

50cb6a3c02abdc4226aedcf7a5b57409c255e262