Adobe Lightroom or Photoshop (any version above 5.5, but the most current is CS3) you can use the crop tool and select an area, and then rotate the selection area to "level" the image.
If I understand you correctly, you can do this in one step, with minimal loss to quality of the image.
