auto merge of #8677 : bblum/rust/scratch, r=alexcrichton

r anybody; there isn't anything complicated here

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

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

diff --cc src/libstd/rt/comm.rs
Simple merge

diff --cc src/libstd/task/spawn.rs
Simple merge