From 4201abd4915e9fd1da4b59874c913ca2c4808008 Mon Sep 17 00:00:00 2001
From: jbevain <jbevain@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Mon, 19 Oct 2009 14:32:45 +0000
Subject: [PATCH] revert 144379

git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@144380 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 class/System.Json/System.Json/ChangeLog     | 4 ----
 class/System.Json/System.Json/JsonArray.cs  | 3 +--
 class/System.Json/System.Json/JsonObject.cs | 3 +--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/class/System.Json/System.Json/ChangeLog b/class/System.Json/System.Json/ChangeLog
index c6eb5a2dee..8e9a6896c5 100644
--- a/class/System.Json/System.Json/ChangeLog
+++ b/class/System.Json/System.Json/ChangeLog
@@ -1,7 +1,3 @@
-2009-10-19  Jb Evain  <jbevain@novell.com>
-
-	* JsonObject.cs, JsonArray.cs: backport r142424 and r143432.
-
 2009-10-05  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* JsonReader.cs : \uXXXX parser was totally wrong, giving wrong #.
diff --git a/class/System.Json/System.Json/JsonArray.cs b/class/System.Json/System.Json/JsonArray.cs
index 92e9bfd6d0..a68877cab6 100644
--- a/class/System.Json/System.Json/JsonArray.cs
+++ b/class/System.Json/System.Json/JsonArray.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -81,7 +80,7 @@ namespace System.Json
 			if (list != null)
 				list.AddRange (items);
 			else
-				source = source.Concat (items);
+				source = new MergedEnumerable<JsonValue> (source, items);
 		}
 
 		public void AddRange (JsonValue [] items)
diff --git a/class/System.Json/System.Json/JsonObject.cs b/class/System.Json/System.Json/JsonObject.cs
index 2cd6d0f6c5..128c7fba6c 100644
--- a/class/System.Json/System.Json/JsonObject.cs
+++ b/class/System.Json/System.Json/JsonObject.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
 using System.IO;
 using System.Text;
@@ -113,7 +112,7 @@ namespace System.Json
 		{
 			if (items == null)
 				throw new ArgumentNullException ("items");
-			source = source.Concat (items);
+			source = new MergedEnumerable<JsonPair> (source, items);
 			map = null;
 		}
 
-- 
2.11.4.GIT