automated merge

indra/llcharacter/llkeyframewalkmotion.cpp

indra/llui/llaccordionctrltab.cpp

indra/newview/llagentcamera.cpp

indra/newview/llagentcamera.h

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/lldrawpoolbump.cpp

indra/newview/llpreviewtexture.cpp

indra/newview/llpreviewtexture.h

indra/newview/llviewertexture.cpp

indra/newview/llviewertexture.h

indra/newview/llviewertexturelist.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llwearable.cpp

indra/newview/llwearable.h

indra/newview/skins/default/xui/da/sidepanel_item_info.xml

indra/newview/skins/default/xui/da/strings.xml

indra/newview/skins/default/xui/de/sidepanel_item_info.xml