Undo commit in subversion simonwillison.net

"svn merge -r 1708:1707". Also, revision keywords.