auto merge of #8264 : thestinger/rust/snapshot, r=Aatch

diff --cc src/libextra/smallintmap.rs
Simple merge

diff --cc src/libextra/treemap.rs
Simple merge

diff --cc src/librustc/middle/typeck/coherence.rs
Simple merge

diff --cc src/libstd/hashmap.rs
Simple merge

diff --cc src/libstd/trie.rs
Simple merge