Merge branch 'next'

author Peter Korsgaard <[email protected]>

Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)

committer Peter Korsgaard <[email protected]>

Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)
author Peter Korsgaard <[email protected]>
Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)
committer Peter Korsgaard <[email protected]>
Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)
diff --cc package/Config.in
Simple merge
diff --cc toolchain/toolchain-external/ext-tool.mk
Simple merge
author	Peter Korsgaard <[email protected]>
	Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)
committer	Peter Korsgaard <[email protected]>
	Mon, 3 Dec 2012 01:19:40 +0000 (17:19 -0800)
		1	2
package/Config.in	patch \|	diff1 \|	diff2 \|	blob \| history
toolchain/toolchain-external/ext-tool.mk	patch \|	diff1 \|	diff2 \|	blob \| history