svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

doc/contributions.txt

indra/llinventory/llinventory.h

indra/llmath/llvolume.cpp

indra/llmessage/llcircuit.cpp

indra/llmessage/llpumpio.cpp

indra/llrender/llfontgl.cpp

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowwin32.cpp

...wview/app_settings/shaders/class2/environment/waterF.glsl

indra/newview/fmod_hidden_symbols.exp

indra/newview/lldrawpool.cpp

indra/newview/lldrawpool.h

indra/newview/lldrawpoolalpha.cpp

indra/newview/lldrawpoolbump.h

indra/newview/lldrawpoolsimple.cpp

indra/newview/lldrawpoolsimple.h

indra/newview/lldrawpoolwater.cpp

indra/newview/lldynamictexture.cpp

indra/newview/lldynamictexture.h