merge

doc/contributions.txt

indra/cmake/Variables.cmake

indra/llcharacter/lljoint.h

indra/llcommon/llmemory.h

indra/llinventory/llinventory.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llrendertarget.cpp

indra/newview/app_settings/high_graphics.xml

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/mid_graphics.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/ultra_graphics.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llappviewer.cpp

indra/newview/llfloaterhardwaresettings.cpp