Result of svn merge -r119432:120464...

indra/lib/python/indra/base/cllsd_test.py

indra/lib/python/indra/base/llsd.py

indra/lib/python/indra/base/metrics.py

indra/lib/python/indra/ipc/servicebuilder.py

indra/lib/python/indra/ipc/siesta.py

indra/lib/python/indra/util/named_query.py

indra/llcommon/CMakeLists.txt

indra/llcommon/llapp.cpp

indra/llcommon/llapp.h

indra/llcommon/llerror.cpp

indra/llcommon/llliveappconfig.cpp

indra/llcommon/llliveappconfig.h

indra/llcommon/lllivefile.cpp

indra/llcommon/lllivefile.h

indra/llcommon/llstat.cpp

indra/llcommon/llstring.h

indra/llcommon/lluri.cpp

indra/llcommon/lluri.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llinventory/llparcel.cpp