Straightening tool software?

I 'm using DPP for post processing Jpeg/RAW pictures which is great & comes free with my 40D camera. In addtion, I like the fact that DPP keeps the exif information even when I export the RAW edited image to jpeg.

One of DPP's limitation is the lack of a straightening tool/feature & framing. Does anyone know of any free software that does this without losing any exif info? I know I can do this in Flickr using its free editing feature but I 'm trying to avoid this.

I 'm trying to avoid buying a full version software for eg: Lightroom/CS3 only to use the two features.
Ta,

Wow, i'm surprised they don't have such a basic function in DPP, google tells me there's no way to straighten in DPP. Irfanview can do it (free, not sure if it works with RAW), and so will photoshop elements (which may have come free with your camera). You might export the ones needing straightening to TIFF, level in PS/Irfanview, then save as JPG with the rest that you batched out.

I am also disappointed that DPP doesn't have a straightening tool. I use DPP to process the file then convert and save to desktop. Picaca (free from Google) picks up the
images from the desktop, there I use the straighting tool and then export back to desktop. This is a cumbersome process, but works pretty well. One would think Canon
would do an update which would allow DPP to have a straightening feature.