]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/kuehn/repo/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 2 Aug 2008 11:03:02 +0000 (07:03 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 2 Aug 2008 11:03:02 +0000 (07:03 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn

bk: 48943ee6Txm6RvyPeoUwpb6kg4_VkQ


Trivial merge