From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jun 2006 20:54:17 +0000 (-0400)
Subject: Merge pogo:/usa/kardel/main-line/ntp-stable
X-Git-Tag: NTP_4_2_2P0_RC5~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b9bb6cd7df34b165bdd1ebae0b80c8c912eaa8b;p=thirdparty%2Fntp.git

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

bk: 449da679KvWVcorEGrFjav5M0ovY0A
---

0b9bb6cd7df34b165bdd1ebae0b80c8c912eaa8b