Partial re-introduction of trunk changes for the next stable version (tools, contrib) Preparation ofr addition of localisation patch to mondo Should not compile in that state