I just connected my iPhone 3G to my computer for charging and iTunes popped up with an offer to download and install iOS 4.

Hurray :)