Merge bk://www.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-sockaddr-1205-15

bk: 4a39f597RQQU5FbFuM-iXolcU8dBCQ

diff --cc ChangeLog
index 497f5a1547253845f8e3490450ec7aab1499f776,92ca4c40e95e025dc3b906b668e3ede90b9d4718..99eaf48c7207f1eba13a263929965b59a18b625a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
-   sockaddr_in6 to remove casts and enable type checking.  Collapse
-   some previously separate IPv4/IPv6 paths into a single codepath.
 +* [Bug 1205] Add ntpd --usepcc and --pccfreq options on Windows
 +* [Bug 1215] unpeer by association ID
 +* [Bug 1225] Broadcast address miscalculated on Windows 4.2.5p180
+ * [Bug 1229] autokey segfaults in cert_install().
 +* Use a union for structs sockaddr, sockaddr_storage, sockaddr_in, and
++sockaddr_in6 to remove casts and enable type checking.  Collapse
++some previously separate IPv4/IPv6 paths into a single codepath.
  (4.2.5p181) 2009/06/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1206] Required compiler changes for Windows
  * [Bug 1084] PPSAPI for ntpd on Windows with DLL backends

diff --cc ntpd/ntp_crypto.c
Simple merge