auto merge of #6566 : brson/rust/libuv, r=brson

This cherry-picks a fix from upstream. It also includes another libuv patch that we were running but was accidentally removed in a submodule update.
This commit is contained in:
bors 2013-05-17 14:31:25 -07:00
commit c34c5051a5

@ -1 +1 @@
Subproject commit 218ab86721eefd7b7e97fa6d9f95a80a1fa8686c
Subproject commit dfae9c3e958dc086d9c0ab068cd76d196c95a433