Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn