Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

indra/newview/skins/default/textures/icons/AudioMute_Off.png

...a/newview/skins/default/textures/icons/AudioMute_Over.png

indra/newview/skins/default/textures/icons/Audio_Off.png

indra/newview/skins/default/textures/icons/Audio_Press.png

...view/skins/default/textures/icons/ExternalBrowser_Off.png

indra/newview/skins/default/textures/icons/Pause_Off.png

indra/newview/skins/default/textures/icons/Pause_Over.png

indra/newview/skins/default/textures/icons/Pause_Press.png

indra/newview/skins/default/textures/icons/Play_Off.png

indra/newview/skins/default/textures/icons/Play_Over.png

indra/newview/skins/default/textures/icons/Play_Press.png

...newview/skins/default/textures/icons/SkipBackward_Off.png

.../newview/skins/default/textures/icons/SkipForward_Off.png

...a/newview/skins/default/textures/icons/StopReload_Off.png

.../newview/skins/default/textures/icons/StopReload_Over.png

indra/newview/skins/default/textures/icons/Zoom_Off.png

...ewview/skins/default/textures/icons/parcel_color_EVRY.png

...newview/skins/default/textures/icons/parcel_color_EXP.png

...a/newview/skins/default/textures/icons/parcel_color_M.png

indra/newview/skins/default/textures/navbar/Flag.png