Patch to follow.
Created attachment 146707 [details] Patch
Created attachment 146708 [details] Patch
Committed r119904: <http://trac.webkit.org/changeset/119904>