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

Conflicts:

	db/jsobj.h

1 files changed, 13 insertions, 13 deletions

diff --git a/db/jsobj.h b/db/jsobj.h
index 746d211febd..f44b6246f63 100644
--- a/db/jsobj.h
+++ b/db/jsobj.h
@@ -174,14 +174,14 @@ class JSObj {
 	friend class JSElemIter;
 	class Details {
 	public:
-        ~Details() {

-			// note refCount means two different things (thus the assert here)

-            assert(refCount <= 0);

-            if (owned()) {

-                free((void *)_objdata);

-            }

-            _objdata = 0;

-        }
+		~Details() {
+			// note refCount means two different things (thus the assert here)
+			assert(refCount <= 0);
+			if (owned()) {
+				free((void *)_objdata);
+			}
+			_objdata = 0;
+		}
 		const char *_objdata;
 		int _objsize;
 		int refCount; // -1 == don't free
@@ -445,15 +445,15 @@ class JSMatcher : boost::noncopyable {
 		Element& toMatch, JSObj& obj, 
 		int compareOp, bool *deep, bool isArr = false);
 
-	struct element_lt

-	{

-		bool operator()(const Element& l, const Element& r) const

-		{

+	struct element_lt
+	{
+		bool operator()(const Element& l, const Element& r) const
+		{
 			int x = (int) l.type() - (int) r.type();
 			if( x < 0 ) return true;
 			if( x > 0 ) return false;
 			return compareElementValues(l,r) < 0;
-		}

+		}
 	};
 public:
 	enum {