Comment 21 for bug 670016

After discussion with Bryce and others on #ubuntu-devel, I've rebased the xorg-server branch on top of the package in maverick-proposed. I also fixed the xserver-xorg-input-evdev depends for the correct xorg-server version.