merging with source:branches/maierman/manager-trees patch available at http://code.downthemall.net/maierman/patches/dta-mt-trunk.diff