From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 5 Dec 2005 20:19:43 +0000 (-0500)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68f90b977968f82282d9139a2dacf5bfbc47acda;p=thirdparty%2Fntp.git

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

bk: 4394a0dfY6ky1ae2ax9yQLGh-uQ8qg
---

68f90b977968f82282d9139a2dacf5bfbc47acda