From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 2 Aug 2008 11:03:02 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/kuehn/repo/ntp-dev
X-Git-Tag: NTP_4_2_5P142~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b3aa43406e13ce667e5e86e34fee427a5f15142;p=thirdparty%2Fntp.git

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

bk: 48943ee6Txm6RvyPeoUwpb6kg4_VkQ
---

4b3aa43406e13ce667e5e86e34fee427a5f15142