merge r21109
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Apr 2010 13:43:57 +0000 (13:43 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Apr 2010 13:43:57 +0000 (13:43 +0000)
commit74759e49daa46acb4c0087d27452c1375f89d739
tree37078c50a42f8f228caadf445abf9b1e27a8c427
parent3469bd0a42fa4b3e73fe693cc62ccfea396dd91c
merge r21109

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