From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 26 Aug 2006 10:10:04 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P36~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de85e69977e0761b23db806503d7261a277ee66e;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-dev
into  whimsy.udel.edu:/deacon/backroom/snaps/ntp-dev

bk: 44f01dfchoa488DjQ9HTv5-Vtmu0uA
---

de85e69977e0761b23db806503d7261a277ee66e