Merge branch 'master' of git://git.dolda.net/wrw