merge

indra/cmake/Copy3rdPartyLibs.cmake

indra/cmake/Variables.cmake

indra/llcommon/CMakeLists.txt

indra/llcommon/ll_template_cast.h

indra/llcommon/llevents.cpp

indra/llcommon/llevents.h

indra/llcommon/lllistenerwrapper.h

indra/llcommon/tests/llerror_test.cpp

indra/llmessage/tests/llsdmessage_test.cpp

indra/llplugin/llpluginmessage.cpp

indra/llplugin/llpluginmessage.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llmenugl.cpp

indra/llui/llscrollcontainer.cpp

indra/llui/llurlentry.cpp

indra/llui/llurlregistry.cpp

indra/media_plugins/base/media_plugin_base.cpp

indra/media_plugins/base/media_plugin_base.h

indra/media_plugins/webkit/media_plugin_webkit.cpp