made trunkinbound inbound context consistent throughout git-svn-id: svn://192.168.202.10@1058 3d104415-ff17-0410-8863-d5cf3c621b8a