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

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

bk: 4d05c005XKQf3xGvZe13juALu5RaBQ

diff --cc ChangeLog
index 1cf69ebdc1d3ed6f3f90046ba4ae70ea8dfcd4ec,b36e12b897ba645d4ee264b41befdbae4e45e03c..e2486f03872ffd78bbc8fd9fd995ca9d36d61b28
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,5 +1,20 @@@
 +* [Bug 1510] from 4.2.6p3-RC12: Add modes 20/21 for driver 8 to support
 +  RAWDCF @ 75 baud.
 +* [Bug 1741] from 4.2.6p3-RC12: Enable multicast reception on each
 +  address (Windows).
 +* from 4.2.6p3-RC12: Other manycastclient repairs:
 +  Separate handling of scope ID embedded in many in6_addr from ifindex
 +  used for IPv6 multicasting ioctls.
 +  Add INT_PRIVACY endpt bit flag for IPv6 RFC 4941 privacy addresses.
 +  Enable outbound multicast from only one address per interface in the
 +  same subnet, and in that case prefer embedded MAC address modified
 +  EUI-64 IPv6 addresses first, then static, and last RFC 4941 privacy
 +  addresses.
 +  Use setsockopt(IP[V6]_MULTICAST_IF) before each send to multicast to
 +  select the local source address, using the correct socket is not
 +  enough.
+ * "server ... ident <groupname>" changes from Dave Mills.
+ * Documentation updates from Dave Mills.
  (4.2.7p92) 2010/12/08 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1743] from 4.2.6p3-RC12: Display timezone offset when showing
    time for sntp in the local timezone.

diff --cc include/ntp.h
Simple merge

diff --cc include/ntp_control.h
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge