auto merge of #6007 : pcwalton/rust/use-mod, r=brson

r? @brson

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

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

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