Everything was peachy until last night when I updated some packages with aptitude (logs pasted below). I've been using the xorg-edgers PPA for a long time with the latest nvidia drivers, so I figured there was something broken in there.
A git version of xserver_1.13 (2:220.127.116.113+git20120730.afa53fe7-0ubuntu0ricotz) can be downloaded from Xorg-edgers PPA for QQ.
Also the necessrary other drivers (input and video) can be obtained from there.
And of course the correct nvidia-current_304.30 is also there.
These are built against the new xserver ABI: xorg-input-abi-18 and xorg-video-abi-13.