Mesa (master): Merge branch '7.8'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 19 08:45:20 2010 -0600

Merge branch '7.8'

Conflicts:

	src/gallium/auxiliary/draw/draw_context.c
	src/gallium/auxiliary/draw/draw_pipe_aaline.c
	src/gallium/drivers/llvmpipe/lp_context.c

---