xmail:
 * revise patches: combine them into one if they belong together, rename them to better reflect their purposes


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