individual hosts, a lot of cleanup) git-svn-id: file:///home/svn/mapi/trunk@689 8d5bb341-7cf1-0310-8cf6-ba355fef3186