Merge r54615.

git-svn-id: http://svn.webkit.org/repository/webkit/branches/safari-4-branch@54621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
3 files changed