Mappero Geotagger is a graphical tool to add geolocation information to your pictures (JPEG or camera raw files). You can manually drag the pictures on a map, or correlate their timing with a GPX track generated by a GPS receiver.