Automated merge with http://hg.secondlife.com/viewer-development

autobuild.xml

indra/cmake/Variables.cmake

indra/llkdu/llimagej2ckdu.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/settings.xml

indra/newview/llfloatersounddevices.cpp

indra/newview/llpanelvoicedevicesettings.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/skins/default/xui/da/language_settings.xml

indra/newview/skins/default/xui/de/language_settings.xml

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

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

indra/newview/skins/default/xui/es/language_settings.xml

indra/newview/skins/default/xui/fr/language_settings.xml

indra/newview/skins/default/xui/it/language_settings.xml