Automated merge with http://hg.secondlife.com/viewer-release

.hgtags

indra/llvfs/lldir.h

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/llxml/tests/llcontrol_test.cpp

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_files.xml

indra/newview/linux_tools/wrapper.sh

indra/newview/llappviewer.cpp

indra/newview/llappviewermacosx.cpp

indra/newview/llcommandlineparser.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfeaturemanager.h

indra/newview/llfloaterabout.cpp

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

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

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

indra/newview/skins/default/xui/es/floater_about.xml

indra/newview/skins/default/xui/fr/floater_about.xml