From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 23 Mar 2012 05:54:38 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P269~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1ff4ac2c6706d31d9ff26b78ee3ab6ba9da58c4;p=thirdparty%2Fntp.git

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

bk: 4f6c101e7-0zC7TZGULM5V62TwFV_g
---

b1ff4ac2c6706d31d9ff26b78ee3ab6ba9da58c4