Merge remote-tracking branch 'erickt/time'

Conflicts:
	src/libstd/time.rs

1 files changed, 8 insertions, 0 deletions

diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index a56b1ac61a0..a22bbe1cd6f 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -96,6 +96,14 @@ mod unicode;
 pub mod test;
 pub mod serialization;
 
+// A curious inner-module that's not exported that contains the binding
+// 'std' so that macro-expanded references to std::serialization and such
+// can be resolved within libcore.
+#[doc(hidden)] // FIXME #3538
+mod std {
+    pub use serialization;
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;