Ubuntu

Comment 33 for bug 315456

Created an attachment (id=31922)
Patch archive (4 commits)

Latest patch attached, in the form of my last 4 commits. Didn't have time to squash them, but they should apply cleanly to current xserver.