svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

indra/llcharacter/llcharacter.h

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframemotion.h

indra/llcharacter/llmotioncontroller.cpp

indra/llcharacter/llmotioncontroller.h

indra/llcharacter/llpose.cpp

indra/llcharacter/llpose.h

indra/llcommon/llframetimer.cpp

indra/llcommon/llframetimer.h

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llimage/llimagejpeg.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llrender/llfontgl.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/llui/lldraghandle.cpp

indra/llui/llfloater.cpp