Merge

indra/llcommon/llversionviewer.h

indra/llplugin/llpluginmessagepipe.cpp

indra/llplugin/llpluginmessagepipe.h

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/llui/llaccordionctrltab.cpp

indra/llui/llaccordionctrltab.h

indra/media_plugins/webkit/mac_volume_catcher.cpp

indra/media_plugins/winmmshim/winmm_shim.cpp

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llchannelmanager.cpp

indra/newview/llchannelmanager.h

indra/newview/llcofwearables.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llinventorybridge.cpp