merge r18470
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 22 Nov 2009 11:54:05 +0000 (11:54 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 22 Nov 2009 11:54:05 +0000 (11:54 +0000)
commit32b6c5ced942424e28288ee79ebde0fcdf59e167
tree35a234b8d62f9ff53a8c1cd7411252e2faa603b8
parentce68c65b68df9fc619018d102ca1069957c38cb7
merge r18470

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