From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 22 Apr 2009 11:50:21 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P164~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=439128a315180cd374d9ebec95ce700890ca6b0a;p=thirdparty%2Fntp.git

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

bk: 49ef047dsEpB0OgnbtJnWSbSnk_aKg
---

439128a315180cd374d9ebec95ce700890ca6b0a