[backfire] merge r21109
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 23 Apr 2010 13:43:57 +0000 (13:43 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 23 Apr 2010 13:43:57 +0000 (13:43 +0000)
commit7fe0fb192ef13d6353510b79353bf64eb8981e6a
tree90f937026e999f1ff03fe0d2e088c0b1ced8ff12
parent5c8d48eb81cd793238d19b4b895bbbb4a80c72f6
[backfire] merge r21109

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