Merge pull request #124 from tomaka/master

Update for rustc 0e784e168 2014-09-16 23:26:11 +0000