Deduplicate some dependencies.

This uses some dependencies from crates.io instead of git
where the crates.io copy was already used in some other part
of the dependency tree, so we had two copies of the same library.

The `android_glue` crate is the only one left where we have two copies,
but solving that is more tricky since we hard-code a path in
`components/servo/.cargo/config`.

components/net/Cargo.toml

@@ -32,4 +32,4 @@ regex = "0.1.14"
 regex_macros = "0.1.8"
 hyper = "0.3"
 flate2 = "0.2.0"
-uuid = "*"
+uuid = "0.1.16"

components/script/Cargo.toml

@@ -60,9 +60,6 @@ git = "https://github.com/servo/rust-mozjs"
 [dependencies.png]
 git = "https://github.com/servo/rust-png"
 
-[dependencies.uuid]
-git = "https://github.com/rust-lang/uuid"
-
 [dependencies.string_cache]
 git = "https://github.com/servo/string-cache"
 
@@ -81,3 +78,4 @@ cssparser = "0.3.1"
 unicase = "0.1"
 num = "0.1.24"
 websocket = "0.11.0"
+uuid = "0.1.16"

components/style/Cargo.toml

@@ -21,9 +21,6 @@ git = "https://github.com/servo/rust-geom"
 [dependencies.selectors]
 git = "https://github.com/servo/rust-selectors"
 
-[dependencies.lazy_static]
-git = "https://github.com/Kimundi/lazy-static.rs"
-
 [dependencies.string_cache]
 git = "https://github.com/servo/string-cache"
 
@@ -39,3 +36,4 @@ mod_path = "0.1"
 bitflags = "*"
 cssparser = "0.3.1"
 num = "0.1.24"
+lazy_static = "0.1.10"

components/util/Cargo.toml

@@ -36,9 +36,6 @@ git = "https://github.com/servo/string-cache"
 [dependencies.string_cache_plugin]
 git = "https://github.com/servo/string-cache"
 
-[dependencies.lazy_static]
-git = "https://github.com/Kimundi/lazy-static.rs"
-
 [dependencies]
 bitflags = "*"
 libc = "*"
@@ -50,3 +47,4 @@ num_cpus = "0.2.2"
 fnv = "1.0"
 cssparser = "0.3.1"
 num = "0.1.24"
+lazy_static = "0.1.10"