Merge remote-tracking branch 'remotes/origin/incoming' into serial

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

diff --cc src/libcore/vec.rs
Simple merge

diff --cc src/librustc/middle/astencode.rs
Simple merge

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

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

diff --cc src/libsyntax/ast.rs
Simple merge