auto merge of #1487 : larsbergstrom/servo/NVIDIA_fixes, r=metajack

Fixes #1185 and #668.

r? @metajack
This commit is contained in:
bors-servo 2014-01-13 13:31:48 -08:00
commit 3cf4f39d22
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 7656f814a61f0b6bf557040b525761279095fc83
Subproject commit e0ec230b478ec4179030d9dd2eb94afa028229fe

@ -1 +1 @@
Subproject commit 3caa5900ea6f5185f1ca4571a4f0e1215dab6937
Subproject commit a6cdac57469b61266bb9abf7551d24f93fd2bb98

@ -1 +1 @@
Subproject commit e1aa6d6e6f4412575908d003bb38df0d38cfa3ca
Subproject commit 2fb3caf8266f4f69e0483fc34dcdf90c3db34062