auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan

Fix for #6306

src/test/compile-fail/core-tls-store-pointer.rs

@@ -10,7 +10,7 @@
 
 // Testing that we can't store a borrowed pointer it task-local storage
 
-use core::task::local_data::*;
+use core::local_data::*;
 
 fn key(_x: @&int) { }
 
@@ -18,4 +18,4 @@ fn main() {
     unsafe {
         local_data_set(key, @&0); //~ ERROR does not fulfill `'static`
     }
-}
+}