[backfire] merge r21523, r21871 & r22222
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 16 Jul 2010 01:00:16 +0000 (01:00 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 16 Jul 2010 01:00:16 +0000 (01:00 +0000)
commit1660376c9d34901fef82e34ea03c1e59efca17a5
treefe7f3f005107e2737c4741ba5274a0fc02b51660
parent5e994345682baab2bf060597395b3716a2c42e83
[backfire] merge r21523, r21871 & r22222

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22223 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/dnsmasq/Makefile
package/dnsmasq/files/dhcp.conf
package/dnsmasq/files/dnsmasq.init