Merge branch 'master' of git.10gen.com:/data/gitroot/p

Conflicts:

	stdafx.h

1 files changed, 15 insertions, 0 deletions

diff --git a/stdafx.cpp b/stdafx.cpp
index ade2d6281ef..88156f17473 100644
--- a/stdafx.cpp
+++ b/stdafx.cpp
@@ -106,5 +106,20 @@ namespace mongo {
         dbexit( status );
     }
 
+    void rawOut( const string &s ) {
+        if( s.empty() ) return;
+        char now[64];
+        time_t_to_String(time(0), now);
+        now[20] = 0;        
+#if defined(_WIN32)
+        (std::cout << now << " " << s).flush();
+#else
+        write( STDOUT_FILENO, now, 20 );
+        write( STDOUT_FILENO, " ", 1 );
+        write( STDOUT_FILENO, s.c_str(), s.length() );
+        fsync( STDOUT_FILENO );        
+#endif
+    }
+    
 
 } // namespace mongo