svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release

indra/llinventory/llparcel.h

indra/llinventory/lltransactiontypes.h

indra/llmessage/llcachename.cpp

indra/llmessage/lluseroperation.h

indra/llui/lldraghandle.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/newview/app_settings/keywords.ini

indra/newview/llagent.cpp

indra/newview/llassetuploadresponders.cpp

indra/newview/llfirstuse.h

indra/newview/llfloaterlandholdings.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llpanelgrouplandmoney.cpp

indra/newview/llpanelgrouplandmoney.h

indra/newview/llpreview.cpp

indra/newview/llstartup.cpp

indra/newview/llviewermessage.cpp