tree 6706dbb8b4f994b919e247647c3e8853d067b45c
parent d288a30610767f87e3e7c069730d4bc255246568
parent 574715d8368f99c0a5720a9676385d58d6cfdf30
author Keith Whitwell <keithw@vmware.com> 1261423121 +0000
committer Keith Whitwell <keithw@vmware.com> 1261423121 +0000

Merge commit 'origin/master' into i965g-restart

Conflicts:
	SConstruct
	configs/default
	configs/linux-dri