svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6

indra/CMakeLists.txt

indra/cmake/LLXUIXML.cmake

indra/integration_tests/llui_libtest/CMakeLists.txt

indra/integration_tests/llui_libtest/llui_libtest.cpp

indra/linux_updater/CMakeLists.txt

indra/linux_updater/linux_updater.cpp

indra/llui/CMakeLists.txt

indra/llui/lltransutil.cpp

indra/llui/lltransutil.h

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h

indra/llwindow/llwindowsdl.cpp

indra/llxuixml/CMakeLists.txt

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/llxuixml/llregistry.h

indra/llxuixml/lltrans.cpp

indra/llxuixml/lltrans.h

indra/llxuixml/lluicolor.cpp

indra/llxuixml/lluicolor.h