From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Jan 2011 01:43:51 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-dev-timeops
X-Git-Tag: NTP_4_2_7P120~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a2c2be83f26c37c5b44044d1a2156bafd8f6bb1;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-dev-timeops
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d3641d7jnVeDN5CiwDnBejnnBbVxQ
---

4a2c2be83f26c37c5b44044d1a2156bafd8f6bb1