From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 10 Mar 2012 09:54:42 +0000 (-0500)
Subject: Merge deacon.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_7P263~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ca2c92863dceedabd4529d060e78dedf8b1be86;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/deacon/backroom/ntp-stable
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4f5b24e2_ENV6G3FM1L3HrBmjGuctg
---

6ca2c92863dceedabd4529d060e78dedf8b1be86