merge r28291
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Sep 2011 08:36:40 +0000 (08:36 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 23 Sep 2011 08:36:40 +0000 (08:36 +0000)
commit7eceb0ab9a69ab29b7695ea88e8b93a2e9ac2442
tree9336956dd0befda4df0f148b61c65af519a4fa11
parent20c5dc05bd7bf77f5fdac58d0003a40eaee3bd28
merge r28291

SVN-Revision: 28292
package/base-files/Makefile
package/base-files/files/lib/network/config.sh