From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Oct 2006 07:38:23 +0000 (-0400)
Subject: Merge pogo:/usa/kardel/main-line/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69a8a1eef2dba381bad4e07e0b7893efbdb9dbaf;p=thirdparty%2Fntp.git

Merge pogo:/usa/kardel/main-line/ntp-dev
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4528aaef36kYIY4APa96nOLYnTELDw
---

69a8a1eef2dba381bad4e07e0b7893efbdb9dbaf