Merge branch 'master' into main

Conflicts:
	SConstruct
	db/btree.h
	db/db.vcxproj.filters
	db/dbcommands_admin.cpp
	db/geo/2d.cpp
	db/pdfile.cpp
	dbtests/test.vcxproj.filters

dbtests/framework.cpp

@@ -84,7 +84,8 @@ namespace mongo {
         string currentTestName;
 
         Result * Suite::run( const string& filter ) {
-            tlogLevel = -1;
+            // set tlogLevel to -1 to suppress tlog() output in a test program
+            // TEMP tlogLevel = -1;
 
             log(1) << "\t about to setupTests" << endl;
             setupTests();