Automated merge with ssh://hg.lindenlab.com/nat/viewer-new-apr

indra/CMakeLists.txt

indra/integration_tests/llui_libtest/CMakeLists.txt

indra/linux_updater/CMakeLists.txt

indra/llcommon/CMakeLists.txt

indra/llcommon/llinitparam.cpp

indra/llcommon/llinitparam.h

indra/llcommon/llprocess.cpp

indra/llcommon/llprocess.h

indra/llcommon/llprocesslauncher.cpp

indra/llcommon/llprocesslauncher.h

indra/llcommon/llregistry.h

indra/llcommon/llsdparam.cpp

indra/llcommon/llsdparam.h

indra/llcommon/llstreamqueue.cpp

indra/llcommon/llstreamqueue.h

indra/llcommon/llstring.h

indra/llcommon/tests/llprocess_test.cpp

indra/llcommon/tests/llsdserialize_test.cpp

indra/llcommon/tests/llstreamqueue_test.cpp

indra/llplugin/llpluginprocessparent.cpp