From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Aug 2008 09:42:21 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Tag: NTP_4_2_5P142~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b9b2cea563e5f90af3e46328c8ac0168744565a;p=thirdparty%2Fntp.git

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

bk: 48ba677dMaXPCgGvQP2fZnvGbxkT_A
---

7b9b2cea563e5f90af3e46328c8ac0168744565a