auto merge of #2647 : glennw/servo/issue-2462, r=metajack

This commit is contained in:
bors-servo 2014-06-12 21:26:06 -04:00
commit 99bc1a85da

@ -1 +1 @@
Subproject commit 5004481eb0b5fdbb24d2ca56fd47767be7690057 Subproject commit 80515323fa470b340157ac6137d0f37b3e2d51d5