auto merge of #5253 : nikomatsakis/rust/issue-5243, r=graydon

author bors <bors@rust-lang.org>

Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)

committer bors <bors@rust-lang.org>

Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)
author bors <bors@rust-lang.org>
Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)
committer bors <bors@rust-lang.org>
Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)
diff --cc src/librustc/metadata/encoder.rs
Simple merge
diff --cc src/librustc/middle/typeck/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)
committer	bors <bors@rust-lang.org>
	Wed, 6 Mar 2013 18:54:58 +0000 (10:54 -0800)
		1	2
src/librustc/metadata/encoder.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/typeck/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history