diff -r 33942ff6e71b -r c55195361cb6 app/soc/logic/dicts.py
--- a/app/soc/logic/dicts.py	Sat Oct 18 21:55:38 2008 +0000
+++ b/app/soc/logic/dicts.py	Sun Oct 19 00:34:33 2008 +0000
@@ -22,14 +22,15 @@
   ]
 
 
-def mergeDicts(target, updates):
+def merge(target, updates):
   """Like the builtin 'update' method but does not overwrite existing values
 
   Args:
     target: The dictionary that is to be updated, may be None
     updates: A dictionary containing new values for the original dict
 
-  Returns: the target dictionary 
+  Returns:
+    the target dict, with any missing values from updates merged in, in-place 
   """
 
   if not target: