Patch to follow.
Created attachment 164876 [details] Patch
Created attachment 164877 [details] Patch
Committed r129117: <http://trac.webkit.org/changeset/129117>