cherry-pick to master

[Keith Packard]

Excerpts from Jeremy Huddleston's message of Tue Oct 13 13:34:52 -0700 2009:

> No, I actually tested these on master and am living on master...

I've cherry-picked these and pushed master out; let's figure out how
to avoid that in future; master should never contain cherry picked
patches :-)

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091013/0f6e0026/attachment-0001.pgp