Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
authorKeith Whitwell <keithw@vmware.com>
Mon, 19 Jan 2009 10:15:04 +0000 (10:15 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 19 Jan 2009 10:15:04 +0000 (10:15 +0000)

Trivial merge