auto merge of #7894 : pcwalton/rust/and-pointers-in-at-boxes, r=brson

r? @brson

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

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

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

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