Merge branch 'svnup' of http://netz.smurf.noris.de/git/git