---

yaml
---
r: 69223
b: refs/heads/auto
c: 73ab6c6
h: refs/heads/master
i:
  69221: 0e89369
  69219: e01d051
  69215: c77a91d
v: v3

Author: olsonjeffery

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 155470fc9cd8e1cdfd0f6ecc558f865f54c1ef29
+refs/heads/auto: 73ab6c60f37263871a5e69f3eeaad72f0d804a02
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/rt/io/timer.rs

@@ -1,12 +1,13 @@
-// copyright 2013 the rust project developers. see the copyright
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://rust-lang.org/copyright.
+// http://rust-lang.org/COPYRIGHT.
 //
-// licensed under the apache license, version 2.0 <license-apache or
-// http://www.apache.org/licenses/license-2.0> or the mit license
-// <license-mit or http://opensource.org/licenses/mit>, at your
-// option. this file may not be copied, modified, or distributed
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
 // except according to those terms.
+
 use option::{Option, Some, None};
 use result::{Ok, Err};
 use rt::io::{io_error};