I added 6611 to this patch since it makes the merge a much cleaner. I
can make another patch only merging 6795+6797, but this will include a
bunch of hand merged stuff that I would love to avoid giving our test
coverage for the 3.0 branch.

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

git-svn-id: http://v8.googlecode.com/svn/branches/3.0@6804 ce2b1a6d-e550-0410-aec6-3dcde31c8c00