From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 30 Oct 2010 02:21:58 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P75~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b3d2ebd223781ac4abeba4a089ba790a9b3d585;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4ccb8146EvFVG9VBHKu1BE3U6QTSCA
---

7b3d2ebd223781ac4abeba4a089ba790a9b3d585