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