merge r27653
authorJo-Philipp Wich <[email protected]>
Sun, 17 Jul 2011 17:22:12 +0000 (17:22 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 17 Jul 2011 17:22:12 +0000 (17:22 +0000)
commit68f60896563961d252be1c8146c39b4db864e25b
tree319d2396adda2937213fe7963f7f8071db2abb3e
parent425b436ceb0096feb3434d72564a5bd1273b08da
merge r27653

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