From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 11 Apr 2011 01:42:40 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P149~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90365d27db9b22552c9ef7bc6418cbf2ebd0fe3c;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  hms-mbp.local:/Users/harlan/src/ntp-dev

bk: 4da25c90w9eAxs6rOhv7RvyzoespCQ
---

90365d27db9b22552c9ef7bc6418cbf2ebd0fe3c