Merge r3505 and r3509 to trunk.
Review URL: http://codereview.chromium.org/505062

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