auto merge of #5319 : brson/rust/debuginfo, r=brson

author bors <bors@rust-lang.org>

Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)

committer bors <bors@rust-lang.org>

Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)
author bors <bors@rust-lang.org>
Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)
committer bors <bors@rust-lang.org>
Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)
diff --cc src/compiletest/runtest.rs
Simple merge
diff --cc src/librustc/middle/trans/debuginfo.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)
committer	bors <bors@rust-lang.org>
	Wed, 13 Mar 2013 18:34:00 +0000 (11:34 -0700)
		1	2
src/compiletest/runtest.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/trans/debuginfo.rs	patch \|	diff1 \|	diff2 \|	blob \| history