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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6fe2c1f54effd85a5d4599737fd22da0f997b3a;p=thirdparty%2Fntp.git

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

bk: 4ccb8146EvFVG9VBHKu1BE3U6QTSCA
---

a6fe2c1f54effd85a5d4599737fd22da0f997b3a