autofix 7390 06.01 patches (refs #2285)

git-svn-id: file:///var/svn/freetz/trunk@11370 149334a1-2f27-0410-a3b9-fc62619ac1e6