Merge branch 'master' of ssh://thekelleys.org.uk/var/cache/git/dnsmasq

Conflicts:
	CHANGELOG

diff --cc CHANGELOG
index 4e6a1fc9a114f4adbee87d8535a110facc0d19fd,050374dc3bff0afdf18b481464ea3eba8497a4e5..c18f1ae429942fe33028989393080ac411c3ad57
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -60,10 -60,29 +60,31 @@@ version 2.6
            AudioCodes Voice Gateways doing streaming writes to flash.
            Thanks to Damian Kaczkowski for spotting the problem.
  
 +          Fix crash with empty DHCP string options when adding zero
 +          terminator. Thanks to Patrick McLean for the bug report.
 +
+           Allow hostnames to start with a number, as allowed in
+           RFC-1123. Thanks to Kyle Mestery for the patch. 
+ 
+           Fixes to DHCP FQDN option handling: don't terminate FQDN
+           if domain not known and allow a FQDN option with blank
+           name to request that a FQDN option is returned in the
+           reply. Thanks to Roy Marples for the patch.
+ 
+           Make --clear-on-reload apply to setting upstream servers
+           via DBus too.
+ 
+           When the address which triggered the construction of an
+           advertised IPv6 prefix disappears, continue to advertise 
+           the prefix for up to 2 hours, with the preferred lifetime
+           set to zero. This satisfies RFC 6204 4.3 L-13 and makes
+           things work better if a prefix disappears without being
+           deprecated first. Thanks to Uwe Schindler for persuasively
+           arguing for this.
+ 
+           Fix MAC address enumeration on *BSD. Thanks to Brad Smith
+           for the bug report.
  
 -
  version 2.66
              Add the ability to act as an authoritative DNS
              server. Dnsmasq can now answer queries from the wider 'net

diff --cc src/rfc2131.c
Simple merge