I got my new Android XPeria X10 mini which comes with... a GPS!
So now I'm looking at various ways that I can contribute to OSM. My hometown Hermanus is quite poorly mapped so I think I'll use it as my test bed.
I'm tried osmand today. I liked that has the ability to directly upload POI's. However there was no nice way to record information on the fly.
So tomorrow I'm going to try Open GPS-Tracker along with its voice annotation option and see if it'll allow me to annotate my gps track in a nice (safe) way.