]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/mayer/ntp-stable-vc6
authorDanny Mayer <mayer@ntp.org>
Mon, 4 Jan 2010 04:05:21 +0000 (23:05 -0500)
committerDanny Mayer <mayer@ntp.org>
Mon, 4 Jan 2010 04:05:21 +0000 (23:05 -0500)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-1448-1450

bk: 4b4169011BL8K0-IadK6j1n-ADNElA


Trivial merge