SVN-import of trunk from svn.oetiker.ch