Automated merge with http://demeter:8000

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llfloatertelehub.cpp

indra/newview/llinspectavatar.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpreview.cpp

indra/newview/llpreviewgesture.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/skins/default/xui/en/floater_about_land.xml

indra/newview/skins/default/xui/en/floater_camera.xml

indra/newview/skins/default/xui/en/floater_im_session.xml

indra/newview/skins/default/xui/en/floater_moveview.xml

indra/newview/skins/default/xui/en/floater_nearby_chat.xml

.../newview/skins/default/xui/en/floater_preview_gesture.xml

indra/newview/skins/default/xui/en/floater_telehub.xml

...a/newview/skins/default/xui/en/floater_voice_controls.xml

indra/newview/skins/default/xui/en/menu_attachment_self.xml