svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654

indra/develop.py

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

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

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

indra/llcharacter/llkeyframestandmotion.cpp

indra/llcommon/llkeythrottle.h

indra/llcommon/llstat.cpp

indra/llcommon/llstat.h

indra/llimage/llimagej2c.cpp

indra/llimage/llimagej2c.h

indra/llinventory/llpermissions.cpp

indra/llinventory/llpermissions.h

indra/llmath/llquaternion.cpp

indra/llmath/llquaternion.h

indra/llmessage/CMakeLists.txt

indra/llmessage/llcachename.cpp

indra/llmessage/llcachename.h

indra/llmessage/llhttpclientadapter.cpp

indra/llmessage/llhttpclientadapter.h

indra/llmessage/llhttpclientinterface.h