From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 24 Jul 2008 06:05:15 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a8a901f0a7ea4756bd9439fc30b99a599aa2f8;p=thirdparty%2Fntp.git

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

bk: 48881b9b1PGF_j4lQow3kIu4cQPQ6Q
---

38a8a901f0a7ea4756bd9439fc30b99a599aa2f8