merge r24051
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 21 Nov 2010 13:54:09 +0000 (13:54 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 21 Nov 2010 13:54:09 +0000 (13:54 +0000)
commit75c147207bd5f855d3699e1760cd63f664bf47fd
treee27237bab3961435abca3e4810ad8e65f99565df
parent8ad27104ba3101230c20f108f4e098265fbe7726
merge r24051

SVN-Revision: 24052
package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init