Merge remote branch 'origin/opengl-es-v2'

diff --cc configure.ac
Simple merge

diff --cc src/mesa/glapi/gl_XML.py
Simple merge

diff --cc src/mesa/glapi/glapitemp.h
Simple merge

diff --cc src/mesa/state_tracker/st_context.c
Simple merge

diff --cc src/mesa/state_tracker/st_extensions.c
Simple merge