git-svn-id: https://svn.code.sf.net/p/jode/code/tags/mergedstable@1060 379699f6-c40d-0410-875b-85095c16579e