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

Conflicts:

	stdafx.h

1 files changed, 0 insertions, 7 deletions

diff --git a/stdafx.h b/stdafx.h
index 788292db112..4c63fd5a0f9 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -312,12 +312,5 @@ namespace mongo {
 #define yassert 1
 using namespace boost::filesystem;
 
-// boost::uint64_T is defined, don't need this
-//#if defined(__linux__)
-//#include "stdint.h"
-//#else if( !defined(uint64_t) )
-//typedef unsigned long long uint64_t;
-//#endif
-
 #include "util/goodies.h"
 #include "util/log.h"