From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 27 May 2007 03:54:33 +0000 (-0400)
Subject: Merge pogo:/usa/kardel/main-line/merge/ntp-dev
X-Git-Tag: NTP_4_2_5P38~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aea67fcb664b1370933bc0f0be3dc12f7520739;p=thirdparty%2Fntp.git

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

bk: 465900f9aFDFn14__bCpbw9pn8Cwtw
---

7aea67fcb664b1370933bc0f0be3dc12f7520739