Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

indra/llcommon/CMakeLists.txt

indra/llcommon/indra_constants.cpp

indra/llcommon/lltrace.cpp

indra/llcommon/lltrace.h

indra/llcommon/lltraceaccumulators.cpp

indra/llcommon/lltraceaccumulators.h

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llcommon/lltracethreadrecorder.cpp

indra/llcommon/lltracethreadrecorder.h

indra/llrender/llvertexbuffer.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfasttimerview.h

indra/newview/llstartup.cpp

indra/newview/llviewerobject.cpp

indra/newview/skins/default/xui/en/floater_stats.xml