automated merge

indra/llimage/llimage.cpp

indra/llui/llaccordionctrl.cpp

indra/llui/llaccordionctrl.h

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llappearancemgr.cpp

indra/newview/llappviewer.cpp

indra/newview/llavatariconctrl.cpp

indra/newview/llcofwearables.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryitemslist.cpp

indra/newview/llinventoryitemslist.h

indra/newview/llpanelpeople.cpp

indra/newview/llpanelteleporthistory.cpp

indra/newview/llsidepanelinventory.cpp

indra/newview/llsidepanelinventory.h

indra/newview/llslurl.cpp