Comment 21 for bug 597895

The one remaining patch, master_device.patch, is present in the xserver git tree, but not in natty's xserver. I'll go ahead and backport that, and I *think* that should be sufficient to close this bug report.