auto merge of #9301 : luqmana/rust/ncm, r=brson

author bors <bors@rust-lang.org>

Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)

committer bors <bors@rust-lang.org>

Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)
author bors <bors@rust-lang.org>
Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)
committer bors <bors@rust-lang.org>
Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)
diff --cc src/librustc/middle/trans/base.rs
Simple merge
diff --cc src/libstd/rt/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)
committer	bors <bors@rust-lang.org>
	Mon, 23 Sep 2013 22:46:05 +0000 (15:46 -0700)
		1	2
src/librustc/middle/trans/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/rt/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history