auto merge of #12192 : luqmana/rust/fix-cross, r=alexcrichton

author bors <bors@rust-lang.org>

Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)

committer bors <bors@rust-lang.org>

Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)
author bors <bors@rust-lang.org>
Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)
committer bors <bors@rust-lang.org>
Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)
diff --cc mk/tests.mk
Simple merge
diff --cc src/compiletest/compiletest.rs
Simple merge
author	bors <bors@rust-lang.org>
	Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)
committer	bors <bors@rust-lang.org>
	Fri, 14 Feb 2014 09:41:46 +0000 (01:41 -0800)
		1	2
mk/tests.mk	patch \|	diff1 \|	diff2 \|	blob \| history
src/compiletest/compiletest.rs	patch \|	diff1 \|	diff2 \|	blob \| history