Merge remote-tracking branch 'original/incoming' into incoming

diff --cc src/cargo/cargo.rs
Simple merge

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

diff --cc src/rustc/metadata/encoder.rs
Simple merge

diff --cc src/test/bench/shootout-k-nucleotide-pipes.rs
Simple merge

diff --cc src/test/bench/shootout-k-nucleotide.rs
Simple merge