From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 22 Oct 2010 07:33:48 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3645a461a2462980784d09e9c51ee2a45107a390;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org/ntp-stable
into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-stable-1669

bk: 4cc13e5cZc0FendWWYUmmfWa-NeDyA
---

3645a461a2462980784d09e9c51ee2a45107a390
diff --cc ChangeLog
index 30c2395720,a3649aeab5..96c1fdb6a3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
  
 +* [Bug 1649] Require NMEA checksum if $GPRMC or previously seen.
+ * [Bug 1669] NTP 4.2.6p2 fails to compile on IBM AIX 5.3.
  
  ---
  (4.2.6p3-RC4) 2010/10/16 Released by Harlan Stenn <stenn@ntp.org>