merge r31267, r31268
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 12 Apr 2012 23:09:39 +0000 (23:09 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 12 Apr 2012 23:09:39 +0000 (23:09 +0000)
commit9a18c1b2f8f6312c134f9c4cbca92a53e73a74f8
treea7d7122781fbc133a2fa08dd111611a3d14d7261
parenteba0a43ebe0fd55c89e40741d97e70538b43c743
merge r31267, r31268

SVN-Revision: 31269
package/base-files/image-config.in
target/imagebuilder/Makefile
target/imagebuilder/files/repositories.conf