Follow rustc master (1add4dedc 2014-10-10)
Merge pull request #6 from Kroisse/master

Follow rustc master (1add4dedc 2014-10-10)