Canon TS-E 17mm f/4L the3 new Tilt-Shift Lens for correcting perspective. This Combined with the Canon EOS 5D makes for wonderful control over angular distortion.
Here is non-Perspective Control vs. Perspective control.
[flashvideo file=i.karlfoto.com/2010/12/Perspective-Control-Sm.m4v /]