I use wallclimber21's solution: loads of pictures :-)

Indeed I got quite a few intersections intersecting our holiday pictures, but they're not too hard to sort out again.

In my opinion, using just one camera with extra batteries (and memory) is favourable over using a seperate lower quality camera for tagging. I take pictures in highest quality in as much wide angle as possible, as to get as much details in a single shot as possible.

Afterwards aligning them with the track using a photo of the GPS-tracking device and finally using them for making the map. JOSM can show your geotagged pictures, as can potlach and I guess merkaartor does as well (can't remember at the moment).

Potlach needs you to upload the photo's to openstreetphoto.org. I only did so for a tryout with a couple of them. You can see them by editing this location in Potlach, and turn on photo's (bottom left icon, next to options):
http://www.openstreetmap.org/?lat=10.10171&lon=105.75239&zoom=16

They're not all as usefull, since indeed, I also took pictures of the surroundings. Besides that, there were hardly any roadsigns to be found :-)

Good luck and have a nice holiday!