From: Danny Mayer <mayer@ntp.org>
Date: Mon, 31 Aug 2009 03:10:59 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/hart/ntp-dev-1289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4e4b14e831673157ec6577579fbaf8b41c66fa7;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/hart/ntp-dev-1289
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-windowscomp2

bk: 4a9b3f43B1fswvsf8lQaKt-Uoy2XMg
---

a4e4b14e831673157ec6577579fbaf8b41c66fa7