Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1675

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1675-win-keyword

bk: 4cc3b2caIWig_jM6GjIDNcK35thDbg

diff --cc ChangeLog
index e0e45f6c83ef5760b551b011d58039de5e69b1e4,eb20656749d379c73b4f78140f2522bf6a215e37..642e0b75b65d1220633e017a70797587d7980cc3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
- * [Bug 1671] Audoomatic delay calibration is sometimes inaccurate.
+ * [Bug 1675] from 4.2.6p3-RC6: Prohibit includefile remote config.
 +* Enable generating ntpd/ntp_keyword.h after keyword-gen.c changes on
 +  Windows as well as POSIX platforms.
+ (4.2.7p69) 2010/10/23 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1671] Automatic delay calibration is sometimes inaccurate.
  (4.2.7p68) 2010/10/22 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1669] from 4.2.6p3-RC5: NTP fails to compile on IBM AIX 5.3.
  * [Bug 1670] Fix peer->bias and broadcastdelay.