Merge branch 'arb_vertex_array_object'

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/enums.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

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