From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 29 Oct 2010 00:04:27 +0000 (-0700)
Subject: Merge stenn.ntp.org:/home/karlsson/ntp-dev
X-Git-Tag: NTP_4_2_7P75~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7e9076d028054dcb9500a8b40fbdb128dcd45fe;p=thirdparty%2Fntp.git

Merge stenn.ntp.org:/home/karlsson/ntp-dev
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/ntp-gsoc-testing

bk: 4cca0f8bA5MeOkgmJb-yVEO4AYFuKQ
---

d7e9076d028054dcb9500a8b40fbdb128dcd45fe