Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1215

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

bk: 4a32ceabqXaK5pSC0OhZZEQGow-C6g

diff --cc ChangeLog
index d0b0af19ffcac7da9f04688578e6476c406cd198,eb9ae919cf8780d839e320647d8e154207b70a78..9d1a8708e32e6f1f3c164fc19eaad3fc47e68951
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 1205] Add ntpd --usepcc and --pccfreq options on Windows
 +* [Bug 1215] unpeer by association ID
  (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