[backfire] 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)
commit2db1614c0ea8d1f119fbbdaf9a82188707e780ec
treefb8c988b93cf2c19ecada9dc1501db540f322cec
parent009984c949f2c30769320e0265b1973e10c104b2
[backfire] merge r31267, r31268

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