auto merge of #9552 : brson/rust/0.9-pre, r=alexcrichton

diff --cc src/etc/kate/rust.xml
Simple merge

diff --cc src/librust/rust.rs
Simple merge

diff --cc src/librustc/rustc.rs
Simple merge

diff --cc src/librusti/rusti.rs
Simple merge

diff --cc src/librustpkg/rustpkg.rs
Simple merge

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