Mesa (mesa_7_7_branch): Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[Ian Romanick]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 006a526edb0f5a67679309a867a1af22d94e1687
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=006a526edb0f5a67679309a867a1af22d94e1687

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Dec 16 09:09:51 2009 -0800

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	src/mesa/drivers/dri/unichrome/via_ioctl.c
	src/mesa/drivers/dri/unichrome/via_screen.c
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom.c

---