matrixtunnel:
 * improve r12475 & r12477 a bit


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