Resolved conflict
Merge pull request #81 from bvssvni/rustup_20140503_rebase

Updated to lastest Rust - Resolved conflict