Photoshop has always offered lens correction options, but CS6 introduces the new Adaptive Wide Angle filter, which is available in the Filter menu. This opens a dialog box similar to Lens Correction, but helps to correct specific types of lens distortion, namely Fisheye, Perspective, Full Spherical and Auto. It will try to automatically find the right type of distortion, but you can always change this. Then you use the sliders to adjust the automated correction. There are tools down the right that let you define points in the image that need correcting and you can get quick, accurate results.