Jaunty Upgrade broke X

[MKelly]

I've waited to upgrade from 8.10 (Intrepid) to 9.04 (Jaunty). I finally tried yesterday, thinking any issues should be sorted out. During the upgrade x-server and related packages failed to upgrade-dependency problems said the error message. So now my system boots, but I have no graphics. Help! Using an old live CD is a major pain. Can someone tell me how to fix this, OR how to downgrade back to what I had before. Seems like a pretty major issue not to have the upgrade process warn me before it was too late.
I'm using a Thinkpad T22.

Thanks!