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

indra/llcharacter/llkeyframewalkmotion.cpp

indra/llcommon/llerror.h

indra/llcommon/llfasttimer.cpp

indra/llcommon/llfasttimer.h

indra/llcommon/lltimer.cpp

indra/llcommon/lltraceaccumulators.h

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llcommon/llunit.h

indra/llcommon/tests/llunits_test.cpp

indra/llinventory/llparcel.cpp

indra/llmath/llmath.h

indra/llrender/llimagegl.cpp

indra/llui/llstatbar.cpp

indra/newview/llconversationlog.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfasttimerview.h

indra/newview/llscenemonitor.cpp

indra/newview/llstartup.cpp

indra/newview/lltexturefetch.cpp