auto merge of #1512 : zmike/servo/master, r=larsbergstrom

This commit is contained in:
bors-servo 2014-01-16 15:37:46 -08:00
commit 156461e4ce

@ -1 +1 @@
Subproject commit e0ec230b478ec4179030d9dd2eb94afa028229fe
Subproject commit e632b98a30eb84c333852e0bc0a68b1b6a7faf02