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

indra/cmake/CMakeLists.txt

indra/cmake/Copy3rdPartyLibs.cmake

indra/cmake/DeploySharedLibs.cmake

indra/cmake/GetPrerequisites_2_8.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/LLSharedLibs.cmake

indra/cmake/Linking.cmake

indra/develop.py

indra/lib/python/indra/util/llmanifest.py

indra/llcommon/CMakeLists.txt

indra/mac_crash_logger/CMakeLists.txt

indra/mac_updater/CMakeLists.txt

indra/newview/CMakeLists.txt

indra/newview/viewer_manifest.py

indra/test_apps/llplugintest/CMakeLists.txt

indra/win_crash_logger/CMakeLists.txt

indra/win_updater/CMakeLists.txt