diff --git a/VERSION b/VERSION
index a14ce75d..7eee3624 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-30 22:07:05) dev
+Version 2.00.0 (2012-07-31 10:47:18) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index a7f75b59..6030ebc0 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -7453,6 +7453,8 @@ class Table(dict):
     def update_or_insert(self, _key=DEFAULT, **values):
         if _key is DEFAULT:
             record = self(**values)
+        elif isinstance(_key,dict):
+            record = self(**_key)
         else:
             record = self(_key)
         if record: