Mesa (master): Merge branch 'kasanen-post-process-v2'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug 25 10:12:12 2011 -0600

Merge branch 'kasanen-post-process-v2'

Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/SConscript

---