Edgy
Well, after much strife, I have successfully upgraded to Xubuntu Edgy.
Tried using the alternative cd upgrade, that died half way through. Then there was a lot of apt-get -f install and apt-get -f dist-upgrade going on until they had probelms, then I had to do some dpkg -r on some troublesome packages. I repeated that a few times until there were no more complaints, rebooted, setup automatix2 and kablammo, a system that was basically the same as before. Hurray!
Not quite the painless upgrade I was expecting.