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

doc/contributions.txt

indra/llcommon/lluri.cpp

indra/llcommon/tests/lluri_test.cpp

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/gpu_table.txt

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llfeaturemanager.cpp

indra/newview/llfeaturemanager.h

indra/newview/llpanellogin.cpp

indra/newview/llviewerstats.cpp

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

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

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

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

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