latest dnsmasq
Merge branch 'master' into dnssec

Conflicts:
	release/src/router/dnsmasq/CHANGELOG
	release/src/router/dnsmasq/Makefile
	release/src/router/dnsmasq/bld/Android.mk
	release/src/router/dnsmasq/debian/changelog
	release/src/router/dnsmasq/src/dnsmasq.h
Latest dnsmasq minus inotify