Rust upgrade
Merge pull request #72 from larsbergstrom/rust_20140224

Rust upgrade