Merge bk://maccarony/ntp-dev

into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1407

bk: 4b1f76b993M3pJLRI4deETebPuuYEA

diff --cc ChangeLog
index d763bcc41d93471692ef381340a4a6c7d94fffce,e8f99250737c81df18152ec250cf428046e0ca2a..96d8be5accf76ea05e856dc9f583027a77eb83ee
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,8 +1,9 @@@
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
+ 
+ ---
+ (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
+ * Include (4.2.4p8) - [Sec 1331] DoS with mode 7 packets - CVE-2009-3563.
+ * [Bug 508] Fixed leap second handling for Windows.
  (4.2.5p250-RC) 2009/11/30 Released by Harlan Stenn <stenn@ntp.org>
  * sntp documentation updates.
  * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers