It's always a scary few minutes, but my phone has rebooted into OS 3.1 and I've used the latest feature in iTunes 9 to do some housecleaning