]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1837
authorHarlan Stenn <stenn@ntp.org>
Thu, 24 Feb 2011 09:42:57 +0000 (04:42 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 24 Feb 2011 09:42:57 +0000 (04:42 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d662821mUZvf5B4bOKVQ9rR_WMsag


Trivial merge