resolve merge issues.

bk: 46591addMTLuyD7wHZvm_fpjNdgsRg

diff --cc ChangeLog
index efefc862457b9e379b5055fe2ac4ba4351f14936,f5732e2e5a17701e96e2538a9583c79321ba8d3b..7eff618ceda90be903a9f652875254672a7e2b7c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,53 -1,9 +1,55 @@@
- * [Bug 789] Fix multicast client crypto authentication and make sure arriving
-           multicast packets do not disturb the autokey dance.
- * [Bug 785] improve handling of multicast interfaces
-           (multicast routers still need to run a multicast routing software/daemon)
 +* [Bug 841] make deferred binding to local interface the default
 +          (allows peers/servers to be configured even when no route exists)
 +* [Bug 840] do fudge configuration AFTER peers (thus refclocks) have been configured
 +* [Bug 824] Added new parser modules to the Windows project file.
 +* [Bug 832] Add libisc/log.c headers to the distribution.
 +* [Bug 808] Only write the drift file if we are in state 4.
 +* Initial import of libisc/log.c and friends.
 +* [Bug 826] Fix redefinition of PI.
 +* [Bug 825] ntp_scanner.c needs to #include <config.h> .
 +* [Bug 824] New parser code has some build problems with the SIM code.
 +* [Bug 817] Use longnames for setting ntp variables on the command-line;
 +          Allowing '-v' with and without an arg to disambiguate usage
 +          is error-prone.
 +* [Bug 822] set progname once, early.
 +* [Bug 819] remove erroneous #if 0 in Windows completion port code.
 +* The new config code missed an #ifdef for building without refclocks.
 +* Distribute some files needed by the new config parsing code.
 +* [Bug 819] Timeout for WaitForMultipleObjects was 500ms instead of INFINITE
 +* Use autogen 5.9.1.
 +* Fix clktest command-line arg processing.'
 +* Audio documentation updates from Dave Mills.
 +* New config file parsing code, from Sachin Kamboj.
 +* fuzz bit cleanup from Dave Mills.
 +* replay cleanup from Dave Mills.
 +* [Bug 542] Tolerate missing directory separator at EO statsdir.
 +* [Bug 812] ntpd should drop supplementary groups.
 +* [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6.
 +* [Bug 740] Fix kernel/daemon startup drift anomaly.
 +* refclock_wwv.c fixes from Dave Mills.
 +* [Bug 810] Fix ntp-keygen documentation.
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows.
 +* [Bug 796] Clean up duplicate #defines in ntp_control.c.
 +* [Bug 569] Use the correct precision for the Leitch CSD-5300.
 +* [Bug 795] Moved declaration of variable to top of function.
 +* [Bug 798] ntpq [p typo crashes ntpq/ntpdc.
 +* [Bug 786] Fix refclock_bancomm.c on Solaris.
 +* [Bug 774] parsesolaris.c does not compile under the new Solaris.
 +* [Bug 782] Remove P() macros from Windows files.
 +* [Bug 778] ntpd fails to lock with drift=+500 when started with drift=-500.
 +* [Bug 592] Trimble Thunderbolt GPS support.
 +* IRIG, CHU, WWV, WWVB refclock improvements from Dave Mills.
 +* [Bug 757] Lose ULONG_CONST().
 +* [Bug 756] Require ANSI C (function prototypes).
 +* codec (audio) and ICOM changes from Dave Mills.
 +\f
 +(4.2.4p2) Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 795] Moved declaration of variable to top of function.
+ * [Bug 789] Fix multicast client crypto authentication and make sure arriving
+           multicast packets do not disturb the autokey dance.
+ * [Bug 785] improve handling of multicast interfaces
+           (multicast routers still need to run a multicast routing
+           software/daemon)
  * [Bug 527] Don't write from source address length to wrong location
  * Upgraded autogen and libopts.
  * [Bug 811] ntpd should not read a .ntprc file.

diff --cc NEWS
Simple merge