Merge pogo:/usa/burnicki/ntp-stable-bug-957

into  whimsy.udel.edu:/deacon/backroom/ntp-stable

bk: 47e4acb2NUB5rpX4GOT2paGcYVLKhw

diff --cc ChangeLog
index 53ea333e1b17d6f70c0c4602c89e79ac4f17432e,99f67117c70c75cd20e19d86f1330f50c00cf5e3..7e867c7154b37eece123b79654269b70d4a75e46
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,5 +1,16 @@@
- * [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set (dup of 908)
+ * [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
+   override the standard parameters from the ImagePath registry key.
 +* Fixes for ntpdate:
 +* [Bug 532] nptdate timeout is too long if several servers are supplied
 +* [Bug 698] timeBeginPeriod is called without timeEndPeriod in some NTP tools
 +* [Bug 857] ntpdate debug mode adjusts system clock when it shouldn't
 +* [Bug 908] ntpdate crashes sometimes
- * ntpdate.c: Under Windows check whether NTP port in use under same conditions as under other OSs.
++* [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set
++  (dup of 908)
 +* [Bug 997] ntpdate buffer too small and unsafe
++* ntpdate.c: Under Windows check whether NTP port in use under same conditions
++  as under other OSs.
 +* ntpdate.c: Fixed some typos and indents (tabs/spaces).
  
  ---
  (4.2.4p4) Released by Harlan Stenn <stenn@ntp.org>