Merge

doc/contributions.txt

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llqueuedthread.cpp

indra/llui/llaccordionctrl.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llavatarlist.cpp

indra/newview/llchiclet.cpp

indra/newview/llfolderview.h

indra/newview/llimview.cpp

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryfunctions.h

indra/newview/lllocationinputctrl.cpp

indra/newview/llpanelgenerictip.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelonlinestatus.cpp

indra/newview/llparticipantlist.cpp

indra/newview/llpreviewtexture.cpp

indra/newview/llpreviewtexture.h

indra/newview/llscriptfloater.cpp