Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1837

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d657e87ORQqQVpbSXuMzf7b_dzaWQ

diff --cc ChangeLog
index 65686dcfc4330040cea634b266ddea2af36d55ee,904614947e22d8659ba49f772fed4e3de207c031..92a6c7e9cf92364164546e51813bfd08cd46c41a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,8 @@@
 +(4.2.7p133) 2011/02/23 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1834] ntpdate 4.2.7p131 aborts with assertion failure.
+ * [Bug 1837] Build fails on Win7 due to regedit requiring privilege.
+ * Provide fallback definitions for GetAdaptersAddresses() for Windows
+   build environments lacking iphlpapi.h.
  * Move sntp last in top-level Makefile.am SUBDIRS so that the libevent
    tearoff (if required) and sntp are compiled after the rest.
  * Use a single set of Automake options for each package in configure.ac