Merge r9870 to trunk due to browser-test failures.

Review URL: http://codereview.chromium.org/8493006

git-svn-id: http://v8.googlecode.com/svn/trunk@9897 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
7 files changed