fix assert id #311
Merge branch 'assert-id'

Conflicts:
	src/mongo/tools/2toku.cpp