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

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llwindow/llwindow.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowwin32.cpp

indra/llwindow/llwindowwin32.h

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/llviewermedia.cpp

indra/test_apps/llplugintest/llmediaplugintest.cpp

install.xml