Comment 28 for bug 883319

Chris, could you put together the combined patch you mentioned and send it to xorg-devel for review? Thanks.