[backfire] merge r21243
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 3 May 2010 00:17:57 +0000 (00:17 +0000)
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 3 May 2010 00:17:57 +0000 (00:17 +0000)
commitee18b13933564cc4d80a2164cd2b42650b3594fc
treee7c53c45ab3c7da51e60ead5fbc3e6a13a83a3d3
parente31c663591f07e71a19a0e3b04e7e22a5d6f4c35
[backfire] merge r21243

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21326 3c298f89-4303-0410-b956-a3cf2f4a3e73
target/linux/x86/image/gen_image_olpc.sh
target/linux/x86/image/gen_image_x86.sh