From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 7 Jan 2011 23:13:26 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-libntp-socket
X-Git-Tag: NTP_4_2_7P114~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a530d8d624de8a4d195430a00eb76663dc65910;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-dev-libntp-socket
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d279e161_ONlYPdak6WAqDIegfgxg
---

8a530d8d624de8a4d195430a00eb76663dc65910