Mesa (master): Merge remote branch 'origin/mesa_7_7_branch'

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jan  6 13:52:22 2010 +0000

Merge remote branch 'origin/mesa_7_7_branch'

Conflicts:
	configs/default
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/mesa/main/version.h

---