Merge

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

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

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

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

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

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

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

diff --cc src/libsyntax/parse/parser.rs
Simple merge

diff --cc src/libsyntax/parse/token.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
Simple merge

diff --cc src/rustc/middle/trans/base.rs
Simple merge

diff --cc src/rustc/middle/ty.rs
Simple merge

diff --cc src/rustc/middle/typeck/check.rs
Simple merge