Use linestrings instead of joins for map? calls
Merge branch 'gsoc13' into linestring

Conflicts:
	src/backend/pgsnapshot/snapshot_selection.cpp