Merge branch 'i965g-restart'

Conflicts:
	configure.ac