Automated merge

indra/llcommon/llversionviewer.h

indra/llmessage/llassetstorage.cpp

indra/media_plugins/webkit/windows_volume_catcher.cpp

indra/newview/CMakeLists.txt

indra/newview/llavatarpropertiesprocessor.cpp

indra/newview/llavatarpropertiesprocessor.h

indra/newview/lldateutil.cpp

indra/newview/lldateutil.h

indra/newview/llfloaterauction.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatertos.cpp

indra/newview/llfloatertos.h

indra/newview/llfloaterurlentry.cpp

indra/newview/llinspectavatar.cpp

indra/newview/llinventoryobserver.cpp

indra/newview/llinventoryobserver.h

indra/newview/llmimetypes.cpp

indra/newview/llmimetypes.h

indra/newview/llnotificationtiphandler.cpp

indra/newview/llpanelavatar.cpp