upstream update, fix FS#38998


git-svn-id: file:///srv/repos/svn-packages/svn@206363 eb2447ed-0c53-47e4-bac8-5bc4a241df78
archrelease: copy trunk to extra-any

git-svn-id: file:///srv/repos/svn-packages/svn@206364 eb2447ed-0c53-47e4-bac8-5bc4a241df78