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

Conflicts:
	scripting/engine_spidermonkey.cpp

2 files changed, 2 insertions, 2 deletions

diff --git a/scripting/engine.cpp b/scripting/engine.cpp
index 3da3941d642..b18ab3b8e77 100644
--- a/scripting/engine.cpp
+++ b/scripting/engine.cpp
@@ -228,7 +228,7 @@ namespace mongo {
     class ScopeCache {
     public:
 
-        ScopeCache(){
+        ScopeCache() : _mutex("ScopeCache") {
             _magic = 17;
         }
         
diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
index a5e495f0b31..408679cd19b 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -669,7 +669,7 @@ namespace mongo {
             }
             }
 
-            log() << "toval: unknown type: " << (int)(e.type()) << endl;
+            log() << "toval: unknown type: " << (int) e.type() << endl;
             uassert( 10218 ,  "not done: toval" , 0 );
             return 0;
         }