http://www.google.com/picasa/index.html
I have been using it for about 3 years now it is a great piece of software!