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

diff --cc ChangeLog
index 30c2395720a6ef5eb64a75fc09e3e98b8779d385,a3649aeab58cbab393793764c87848749e0eccec..96c1fdb6a347c22195769e1296a9295d0dfde759
--- 1/ChangeLog
--- 2/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>