bip:
 * remove unnecessary overrides
 * revise patches


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