auto merge of #11895 : xales/rust/libstd, r=alexcrichton

author bors <bors@rust-lang.org>

Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)

committer bors <bors@rust-lang.org>

Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)
author bors <bors@rust-lang.org>
Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)
committer bors <bors@rust-lang.org>
Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)
diff --cc src/libextra/arc.rs
Simple merge
diff --cc src/libextra/sync.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)
committer	bors <bors@rust-lang.org>
	Thu, 30 Jan 2014 21:36:41 +0000 (13:36 -0800)
		1	2
src/libextra/arc.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libextra/sync.rs	patch \|	diff1 \|	diff2 \|	blob \| history