auto merge of #8278 : cmr/rust/workaround, r=brson

author bors <bors@rust-lang.org>

Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)

committer bors <bors@rust-lang.org>

Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)
author bors <bors@rust-lang.org>
Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)
committer bors <bors@rust-lang.org>
Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)
diff --cc src/librustc/middle/resolve.rs
Simple merge
diff --cc src/libsyntax/codemap.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)
committer	bors <bors@rust-lang.org>
	Tue, 6 Aug 2013 03:07:59 +0000 (20:07 -0700)
		1	2
src/librustc/middle/resolve.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/codemap.rs	patch \|	diff1 \|	diff2 \|	blob \| history