From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 17 Aug 2008 22:53:25 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_5P125~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=584664786d945049fbd259bd2cde4cb46504cfc1;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-clemens

bk: 48a8abe5LbvuZW89DuIeH2QJJFSGFQ
---

584664786d945049fbd259bd2cde4cb46504cfc1