auto merge of pull req #4777 from thestinger/rust, r=graydon

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

diff --cc src/librustc/middle/trans/closure.rs
Simple merge

diff --cc src/librustc/middle/trans/common.rs
Simple merge

diff --cc src/librustc/middle/trans/datum.rs
Simple merge

diff --cc src/librustc/middle/trans/foreign.rs
Simple merge

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

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