merge

doc/contributions.txt

indra/llcommon/llsys.cpp

indra/llrender/llvertexbuffer.cpp

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/lltranslate.cpp

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

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

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

...newview/skins/default/xui/de/floater_wearable_save_as.xml

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

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

...ewview/skins/default/xui/en/floater_windlight_options.xml

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

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

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

...wview/skins/default/xui/es/floater_preview_classified.xml