auto merge of #11846 : michaelwoerister/rust/cu_name, r=pcwalton

author bors <bors@rust-lang.org>

Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)

committer bors <bors@rust-lang.org>

Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)
author bors <bors@rust-lang.org>
Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)
committer bors <bors@rust-lang.org>
Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)
diff --cc src/librustc/middle/trans/base.rs
Simple merge
diff --cc src/librustc/middle/trans/context.rs
Simple merge
diff --cc src/librustc/middle/trans/debuginfo.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)
committer	bors <bors@rust-lang.org>
	Mon, 27 Jan 2014 22:46:56 +0000 (14:46 -0800)
		1	2
src/librustc/middle/trans/base.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/trans/context.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/trans/debuginfo.rs	patch \|	diff1 \|	diff2 \|	blob \| history