Merge r7000 from the bleeding_edge to 2.5 branch.
Review URL: http://codereview.chromium.org/6591071

git-svn-id: http://v8.googlecode.com/svn/branches/2.5@7001 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
2 files changed