Merge

.hgignore

etc/message.xml

indra/cmake/GoogleMock.cmake

indra/cmake/LLAddBuildTest.cmake

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

indra/lib/python/indra/base/lluuid.py

indra/lib/python/indra/util/llsubprocess.py

indra/lib/python/indra/util/llversion.py

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

indra/llcharacter/llkeyframestandmotion.cpp

indra/llcommon/CMakeLists.txt

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llkeythrottle.h

indra/llcommon/llsdserialize_xml.cpp

indra/llcommon/llstat.cpp

indra/llcommon/llstat.h

indra/llcommon/llstringtable.h

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h