merge [21362:21365] & [21369]
authorNicolas Thill <nico@openwrt.org>
Sun, 16 May 2010 13:45:38 +0000 (13:45 +0000)
committerNicolas Thill <nico@openwrt.org>
Sun, 16 May 2010 13:45:38 +0000 (13:45 +0000)
commitbf1a7ec61afc5cc6953beee648f8db05c826ab78
treee69d3ebd1bb0f4a7a7dfa80e9429dac6976eed80
parent31c44b026b241d964ef0dfa498cd1cc8c922c5ba
merge [21362:21365] & [21369]

SVN-Revision: 21476
Config.in
include/image.mk
target/linux/rb532/image/Makefile
target/linux/x86/image/Config.in
target/linux/x86/image/Makefile