merge r27145
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Jun 2011 12:26:44 +0000 (12:26 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Jun 2011 12:26:44 +0000 (12:26 +0000)
commit8ff1376767245d8bae594618534e1a256e203e11
tree5d4dccbe57308dd90f71431a122ae7a875f5c358
parenta57940fd48ef746c4eec893fd2e1d9b147483fbd
merge r27145

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