merge r20669
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 3 Apr 2010 13:44:38 +0000 (13:44 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 3 Apr 2010 13:44:38 +0000 (13:44 +0000)
commitb1cf1195b33485a843a2158f10ef9dc2d3539710
tree6c87d5bb944a02806d9beea0999bd4d60bfb8c63
parent4bd12a12642616bc64168e7ce21e828071d957eb
merge r20669

SVN-Revision: 20671
package/base-files/Makefile
package/base-files/files/etc/init.d/network