So I think I know the answer but figure I'd ask... Have a 3GS and unlocked/jailbroken on 3.0. Want to upgrade to 3.1 and don't care about any future unlocking since i'm on AT&T anyways. Safe to assume that I need to wait for the official 3.1 pawnage tools to upgrade to 3.1 on the GS?