Android 2.1

I've successfully upgraded my phone to 2.1! After my failed attempt last week I did some more research and found a blog post which suggested taking the battery out during the upgrade. The trick is to take the battery out when it gets stuck on step 3 "upgrading the firmware on the phone". It then tells you that there has been an error, and that you need to press Volume Down + Camera + Power. When you do this the phone displays a Blue SIM logo and a downloading status bar. You can then click back through steps 1 & 2, and when you get to step 3 it actually installs the update, only taking a minute or two. The phone then restarts and you have to re-associate it with you google account and wait for it to resync your contacts, mail, etc. This took a surprisingly long time, I'm not sure how long as I gave up and went to bed! If you had AppBrain installed then the next thing to do install that and use it to re-install your apps.