Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix

indra/cmake/APR.cmake

indra/cmake/GStreamer010Plugin.cmake

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llcallingcard.cpp

indra/newview/llfloaterinventory.cpp

indra/newview/llinspectavatar.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llnotificationtiphandler.cpp

indra/newview/llurldispatcher.cpp

indra/newview/llviewermenu.cpp

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

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

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

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

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