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

diff --cc src/libstd/prelude.rs
index 5b8833f3f361bdbff53f3a03a1fddad5a5b89044,65db55297b3b70e673146e74b19f2c58d3121d52..f035e61fa1e08a6db8c480f727bcee5dba082086
--- 1/src/libstd/prelude.rs
--- 2/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@@ -64,8 -64,8 +65,8 @@@ pub use path::PosixPath
  pub use path::WindowsPath;
  pub use ptr::RawPtr;
  pub use ascii::{Ascii, AsciiCast, OwnedAsciiCast, AsciiStr, ToBytesConsume};
 -pub use str::{Str, StrVector, StrSlice, OwnedStr, NullTerminatedStr};
 +pub use str::{Str, StrVector, StrSlice, OwnedStr};
- pub use from_str::{FromStr};
+ pub use from_str::FromStr;
  pub use to_bytes::IterBytes;
  pub use to_str::{ToStr, ToStrConsume};
  pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};

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

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

diff --cc src/libstd/str/ascii.rs
index 5ffb7efab314e0563689fccea535f635853b36fa,1be4d07dfa477ccdf7056e1117362d7d2f6bab4c..b4d3e4b0ad1421fe66209be870c3f2b96b567de6
--- 1/src/libstd/str/ascii.rs
--- 2/src/libstd/str/ascii.rs
+++ b/src/libstd/str/ascii.rs
@@@ -13,11 -13,12 +13,14 @@@
  use to_str::{ToStr,ToStrConsume};
  use str;
  use str::StrSlice;
+ use str::OwnedStr;
+ use container::Container;
  use cast;
+ use ptr;
  use iterator::{Iterator, IteratorUtil};
 -use vec::{CopyableVector, ImmutableVector, OwnedVector};
 +use vec::{CopyableVector, ImmutableVector};
 +#[cfg(stage0)]
 +use vec::OwnedVector;
  use to_bytes::IterBytes;
  use option::{Some, None};