Merge pull request #45 from msiemens/patch-1

Update to Rust master: String conversion updates

Author: BurntSushi

src/lib.rs

@@ -219,7 +219,7 @@ use std::collections::HashMap;
 use std::error::Error as StdError;
 use std::error::FromError;
 use std::fmt;
-use std::from_str::{FromStr, from_str};
+use std::str::{FromStr, from_str};
 use std::num;
 use std::num::NumCast;
 use serialize::Decodable;