From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 7 Jan 2011 08:42:54 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P131~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2804314ec7c4e9e8ddf2a7ec900841f5f1c1286;p=thirdparty%2Fntp.git

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

bk: 4d26d20eWloo5Cni1PAVbIi7gp0cjQ
---

f2804314ec7c4e9e8ddf2a7ec900841f5f1c1286