This shows which devices can be jailbroken by what software and links to a tutorial. Very friendly. iPhone & iTouch Jailbreak / Unlock Matrix | jailbreakmatrix.com.

All you do after the update is surf to the site and make it run JailbreakMe 2.0.