If you are wondering what you actually get on the 3G phone when you upgrade to iPhone 4.0 OS here be a list of what we have found so far.

Folders - Simply press on an app and drag it to another app and let go. A Folder will be created. You can add and remove apps as well as change the name of the folders.

Camera Zoom - Simply tap the screen when running the camera and you will get a slider at the bottom of the screen. Not real great zoom but better than nothing.

Photos now have places. Once you click on the photos, you will see Albums and Places icons. Click on places and you will get a map showing the location of you photos (those with lats and longs). Click on the market and it will show you which photos.

Search - You can now search the Web and Wikipedia from the iPhone spotlight search.

Email - Now you have a single thread option for all emails. Click on you mail app and choose “All Inboxes”.

iPod - New playlist functionality including easy edit and delete. Some nice UI changes for selecting music.

iBook App - Download from the App Store - Not sure yet if it will sync the page you are up to between iPad and iPhone.

Images and Video to come.

Enjoy.