Thanks for your help! I already had Picasa, and didn't know it did it. I found that the regular "rotate" buttons do the traditional 90, 180, 270 degree rotations, but there is a button called "straighten" on the left side of the screen that does exactly what I wanted it to do.