Merge branch 'origin' into randr-1.2-origin
authorDave Airlie <airlied@linux.ie>
Wed, 21 Mar 2007 07:27:21 +0000 (18:27 +1100)
committerDave Airlie <airlied@linux.ie>
Wed, 21 Mar 2007 07:27:21 +0000 (18:27 +1100)
commitdfe6500af823d6ac003ad793d13cb3929c62423d
tree5b84421178c96aadfddb684134147f6d5c762c6e
parentc3c4cb0a0791e722af1cbb1841a84e4a70fcb0af
parent23fdec37c580c3b5de263dfd48bd80fa9f21bc19
Merge branch 'origin' into randr-1.2-origin