remove redundancy in an error message
Merge branch 'grey_binary_sindex' into sam_2789_disk_structure
Merge branch 'sam_2789_disk_structure' into sam_2789_keyfix

Conflicts:
	src/rdb_protocol/datum.cc