Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137

doc/contributions.txt

indra/CMakeLists.txt

indra/cmake/LLAddBuildTest.cmake

indra/llcommon/CMakeLists.txt

indra/llplugin/CMakeLists.txt

indra/llplugin/slplugin/CMakeLists.txt

indra/llxuixml/llxuiparser.cpp

indra/media_plugins/base/CMakeLists.txt

indra/media_plugins/example/CMakeLists.txt

indra/media_plugins/gstreamer010/CMakeLists.txt

indra/media_plugins/webkit/CMakeLists.txt

indra/newview/llvocache.h

indra/newview/viewer_manifest.py