Merge branch 'master' of git@github.com:mongodb/mongo

SConstruct

db/btree.h

db/btreecursor.cpp

db/cursor.h

db/dbcommands.cpp

db/matcher.cpp

db/matcher.h

db/namespace.h

db/pdfile.cpp

db/query.cpp

db/queryoptimizer.cpp

db/queryoptimizer.h

db/queryutil.cpp

dbtests/queryoptimizertests.cpp

debian/init.d

jstests/cursor3.js

jstests/in2.js

jstests/index_check3.js

jstests/indexc.js

jstests/objid1.js