With the release of the iPhone 2.0 firwmare (available from Apple's own servers), we installed the software on our previously "jailbroken" and "unlocked" iPhone without any problems (no word yet on whether the unlock is still working). The entire process took about 20 minutes (maybe a bit longer) using iTunes' restore function (download the softwar
