---

yaml
---
r: 162314
b: refs/heads/auto
c: c394a6c
h: refs/heads/master
v: v3

Author: aidancully

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 7bf7bd6a75c38ed71df69cb9149eb7fdce23ced5
+refs/heads/auto: c394a6c238a2e981f9092e142029ec5b465c1dcd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/sys/common/thread_local.rs

@@ -193,7 +193,7 @@ impl StaticKey {
         // prove that it has not yet been set. As such, we'll continue using a
         // value of 0, but with some gyrations to make sure we have a non-0
         // value returned from the creation routine.
-        // TODO: this is clearly a hack, and should be cleaned up.
+        // FIXME: this is clearly a hack, and should be cleaned up.
         let key1 = imp::create(self.dtor);
         let key = if key1 != 0 {
             key1