Small update
Merge branch 'master' of github.com:thuys/mongodb

Conflicts:
	model/_init.cf