auto merge of #5365 : thestinger/rust/map, r=catamorphism

author bors <bors@rust-lang.org>

Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)

committer bors <bors@rust-lang.org>

Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)
author bors <bors@rust-lang.org>
Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)
committer bors <bors@rust-lang.org>
Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)
diff --cc src/libcore/hashmap.rs
Simple merge
diff --cc src/libstd/treemap.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)
committer	bors <bors@rust-lang.org>
	Thu, 14 Mar 2013 22:06:49 +0000 (15:06 -0700)
		1	2
src/libcore/hashmap.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/treemap.rs	patch \|	diff1 \|	diff2 \|	blob \| history