Merge branch 'webrick' of git://git.bogomips.org/git-svn