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

into  pogo.udel.edu:/pogo/users/burnicki/ntp-dev-bug-957

bk: 4737b5447jeDuEzNP-Rm2D1EEDxCpA

diff --cc ChangeLog
index 99ebe90a2e65734191fd7cfd362684254f13a26a,14c138a5f851f82e574e1b8d854303a5df16e5ea..27b0072af9c123781129c0638f535a8e79d28433
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
 +  override the standard parameters from the ImagePath registry key.
 +* Added HAVE_INT32_T to the Windows config.h to avoid duplicate definitions.
+ * Work around a VPATH difference in FreeBSD's 'make' command.
  * Update bugreport URL.
  * Update -I documentation.
  * [Bug 713] Fix bug reporting information.