Merge remote-tracking branch 'remotes/origin/master' into remove-str-trailing-nulls

diff --cc src/libextra/time.rs
Simple merge

diff --cc src/librustc/back/link.rs
Simple merge

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

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

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

diff --cc src/libstd/path.rs
index de34ec4bed5e1cf1d7e986a6c6d572ab215a6e3d,3e1cb50ce4e610701f5a441b1bd72d584e85be60..14844e24006c5364b5f6d809bd557e0c28dc5ff4
--- 1/src/libstd/path.rs
--- 2/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@@ -16,13 -16,12 +16,14 @@@ Cross-platform file path handlin
  
  #[allow(missing_doc)];
  
 +use c_str::ToCStr;
 +use c_str;
  use clone::Clone;
 -use container::Container;
  use cmp::Eq;
- use iterator::{Iterator, IteratorUtil};
 +use container::Container;
+ use iterator::{Iterator, IteratorUtil, range};
  use libc;
+ use num;
  use option::{None, Option, Some};
  use str::{OwnedStr, Str, StrSlice, StrVector};
  use to_str::ToStr;

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

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

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

diff --cc src/libstd/unstable/lang.rs
index c41712eb80a252aee96c48294841d042d5f4ba2a,c5112529aed9f2494dc8f11eab25cc0b6fc40471..457f640033cb9f2ce8d25bc20911410eaf7699b0
--- 1/src/libstd/unstable/lang.rs
--- 2/src/libstd/unstable/lang.rs
+++ b/src/libstd/unstable/lang.rs
@@@ -10,12 -10,11 +10,12 @@@
  
  //! Runtime calls emitted by the compiler.
  
 +use c_str::ToCStr;
  use cast::transmute;
  use libc::{c_char, c_uchar, c_void, size_t, uintptr_t, c_int};
+ use option::{Some, None};
  use str;
  use sys;
- use rt::{context, OldTaskContext};
  use rt::task::Task;
  use rt::local::Local;
  use rt::borrowck;