Mesa (master): Merge branch 'mesa_7_5_branch'

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Jun 11 16:34:56 2009 +0100

Merge branch 'mesa_7_5_branch'

Conflicts:
	src/mesa/state_tracker/st_cb_fbo.c
	src/mesa/state_tracker/st_framebuffer.c

---