merge.

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llinventoryobserver.cpp

indra/newview/llmediactrl.cpp

indra/newview/llmediactrl.h

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

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

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

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

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

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

indra/newview/skins/default/xui/ja/floater_buy_currency.xml

indra/newview/skins/default/xui/pt/floater_buy_currency.xml

install.xml