Merge branch '7.8'

Conflicts:

	src/glx/dri2_glx.c
	src/glx/glx_pbuffer.c

diff --cc src/glx/dri2_glx.c
Simple merge

diff --cc src/glx/dri_common.c
Simple merge

diff --cc src/glx/drisw_glx.c
Simple merge

diff --cc src/glx/glx_pbuffer.c
Simple merge

diff --cc src/glx/glxclient.h
Simple merge

diff --cc src/glx/glxcmds.c
Simple merge