Created attachment 14700 [details] [review]
I posted this patch at xorg@ some time ago. Posting again
to avoid it being lost.
Err, this was fixed in commit 7273b0f586f04fe9c29ac206d5d9bf51fa92cc22