svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640

doc/contributions.txt

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

indra/llcommon/llkeythrottle.h

indra/llcommon/llsecondlifeurls.cpp

indra/llcommon/llsecondlifeurls.h

indra/llcommon/lluri.cpp

indra/llcommon/lluri.h

indra/llcommon/u64.cpp

indra/llcommon/u64.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llui/llkeywords.cpp

indra/llui/llkeywords.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/newview/gpu_table.txt

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp

indra/newview/lldrawable.cpp

indra/newview/llfloaterpreference.cpp