From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 6 Jan 2011 07:58:55 +0000 (+0000)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P131~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c7ff06626f78368644f3bd5ce86f4df1af8db6e;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-libevent

bk: 4d25763fG2tU2Pf6mfyArfDfoERNLg
---

2c7ff06626f78368644f3bd5ce86f4df1af8db6e