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