auto merge of #11944 : nathanielherman/rust/vec_opt, r=alexcrichton

author bors <bors@rust-lang.org>

Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)

committer bors <bors@rust-lang.org>

Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)
author bors <bors@rust-lang.org>
Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)
committer bors <bors@rust-lang.org>
Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)
diff --cc src/librustc/middle/trans/cleanup.rs
Simple merge
diff --cc src/libstd/vec.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)
committer	bors <bors@rust-lang.org>
	Sat, 1 Feb 2014 15:21:23 +0000 (07:21 -0800)
		1	2
src/librustc/middle/trans/cleanup.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/vec.rs	patch \|	diff1 \|	diff2 \|	blob \| history