automated merge

indra/newview/CMakeLists.txt

indra/newview/llappviewer.cpp

indra/newview/llmachineid.cpp

indra/newview/llmachineid.h

indra/newview/llpanellogin.cpp

indra/newview/llpaneloutfitedit.cpp

indra/newview/llsecapi.cpp

indra/newview/llsecapi.h

indra/newview/llsechandler_basic.cpp

indra/newview/llsechandler_basic.h

indra/newview/llsidepanelappearance.cpp

indra/newview/llsidepanelappearance.h

indra/newview/llstartup.cpp

indra/newview/llurldispatcher.cpp

indra/newview/llviewernetwork.cpp

indra/newview/llviewernetwork.h

indra/newview/llxmlrpctransaction.cpp

indra/newview/skins/default/xui/en/notifications.xml

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

indra/newview/tests/llsechandler_basic_test.cpp