Merge r34154.

git-svn-id: http://svn.webkit.org/repository/webkit/branches/Safari-3-1-branch@34255 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2 files changed