Prob before the US
So easy to do it yourself anyway.
Install CWM with Odin, then go to Docs kitchen and install the non-wipe version.
Bonus it shall work and is no dodgy Kies involved
plus you get a real kernel, Speedmod etc and can convert the entire file system to ext4 aswell... Worth it just for the huge speed increase etc from stock..
Sent from my GT-I9000 using XDA App