# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1309819078 -7200
# Node ID 583b1de09eec24d2ffb9d06d2bc3801c2654d571
# Parent  13aae946513bcbc0e226329dffe3901d6c03b120
Simplified ObjectSet merging which seemed to be attempting to combine individual values.

diff -r 13aae946513b -r 583b1de09eec micropython/common.py
--- a/micropython/common.py	Tue Jul 05 00:36:54 2011 +0200
+++ b/micropython/common.py	Tue Jul 05 00:37:58 2011 +0200
@@ -124,9 +124,7 @@
             if not self.has_key(key):
                 merged[key] = other[key]
             else:
-                for other_value in other[key]:
-                    for value in self[key]:
-                        merged[key] = value + other_value
+                merged[key] = self[key] + other[key]
 
         for key in self.keys():
             if not merged.has_key(key):