merge

doc/contributions.txt

indra/llmath/llquaternion.h

indra/llprimitive/llmodel.cpp

indra/llrender/llrender.cpp

indra/llui/llfolderviewitem.cpp

indra/llui/llfolderviewmodel.h

indra/llui/llkeywords.cpp

indra/llui/llmenugl.cpp

indra/llui/llstatbar.cpp

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlregistry.cpp

indra/llui/llurlregistry.h

indra/llui/llview.cpp

indra/llwindow/llopenglview-objc.mm

indra/llwindow/llwindowmacosx-objc.h

indra/llwindow/llwindowmacosx.cpp

indra/newview/app_settings/settings.xml

.../newview/app_settings/shaders/class1/deferred/alphaV.glsl

indra/newview/llagent.cpp