I have also used Picasa photo management & editing software from Google. It is comparable to Lightroom for photo management (organizing, searching, uploading...), but does not have the extensive editing tools found in Lightroom.
However, Picasa has two features not found in Lightroom: Adding text to photos & creating collages. These tools are dead simple to use and quite useful. Here is a photo I created in a couple of minutes using Picasa.
