refs #132, make a fix because lockType is passed around as int
Merge branch 'master' of github.com:Tokutek/mongo

Conflicts:
	src/mongo/db/commands/txn_commands.cpp