Merge commit 'd89ff7eef969aee6b493bc846b64d68358fafbcd' into remove-str-trailing...

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

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

diff --cc src/libstd/std.rs
index d51f0de1d275b2bd84eaa273a7a6a123e9ec25b8,568709c89da73d73039ac9eb042b346803382671..236103ec886521b236c52e08b2da14bbae77ec36
--- 1/src/libstd/std.rs
--- 2/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@@ -170,9 -170,7 +170,8 @@@ pub mod local_data
  
  /* Runtime and platform support */
  
- pub mod gc;
  pub mod libc;
 +pub mod c_str;
  pub mod os;
  pub mod path;
  pub mod rand;

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

diff --cc src/libstd/sys.rs
index b40f87617a91411fa263d77bca0996e9cb0dc0b0,9d853087123e831618df134020fe20fba4a118b9..83ee4cf07c6a348e54656b8873a9e9a651e66432
--- 1/src/libstd/sys.rs
--- 2/src/libstd/sys.rs
+++ b/src/libstd/sys.rs
@@@ -12,9 -12,7 +12,8 @@@
  
  #[allow(missing_doc)];
  
 +use c_str::ToCStr;
  use cast;
- use gc;
  use io;
  use libc;
  use libc::{c_char, size_t};