auto merge of #7371 : alexcrichton/rust/trying, r=cmr

This is an attempt at a smaller request than #7113, it's just the first two commits
This commit is contained in:
bors 2013-06-25 10:47:01 -07:00
commit 032dcc57e8
13 changed files with 57 additions and 17 deletions