Mesa (master): Merge branch 'master' of ssh://people.freedesktop.org/ ~jbarnes/mesa

[Jesse Barnes]

Module: Mesa
Branch: master
Commit: c6ef705e414c8e93ee471f50d15ada3492a9b067
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6ef705e414c8e93ee471f50d15ada3492a9b067

Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Mon Jan 11 15:23:29 2010 -0500

Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa

Conflicts due to DRI1 removal:
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_screen.c

---