I've been cleaning up the Ubuntu X packages, and I've run across some patches that have been reviewed some time ago but aren't yet in master. Resending them, since I've clearly dropped them on the floor at one point.