svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

doc/contributions.txt

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframemotionparam.cpp

indra/llcharacter/llstatemachine.cpp

indra/llcharacter/llvisualparam.cpp

indra/llcommon/llstat.cpp

indra/llcommon/llstringtable.h

indra/llcommon/lluri.cpp

indra/llcommon/lluri.h

indra/llimage/llimage.cpp

indra/llinventory/lleconomy.cpp

indra/llinventory/lleconomy.h

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llinventory/llpermissions.cpp

indra/llmath/llcamera.cpp