From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 17 Aug 2007 09:43:14 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ecec382dce0b8dcefa2d4779687401254e73b78;p=thirdparty%2Fntp.git

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

bk: 46c56db25jat9Yxo6YtY_ls6Aa9FqQ
---

2ecec382dce0b8dcefa2d4779687401254e73b78