diff --git a/VERSION b/VERSION
index 2188ad7d..87a930e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.6 (2012-09-03 10:18:10) stable
+Version 2.0.6 (2012-09-03 14:34:54) stable
diff --git a/gluon/dal.py b/gluon/dal.py
index 172a773c..c15f678b 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -7179,7 +7179,7 @@ def index():
         adapter.close()
 
     def executesql(self, query, placeholders=None, as_dict=False,
-                   fields=None, colnames=None):
+                   fields=None, colnames=None, fetch=True):
         """
         placeholders is optional and will always be None.
         If using raw SQL with placeholders, placeholders may be
@@ -7232,6 +7232,8 @@ def index():
             adapter.execute(query, placeholders)
         else:
             adapter.execute(query)
+        if not fetch:
+            return None
         if as_dict:
             if not hasattr(adapter.cursor,'description'):
                 raise RuntimeError, "database does not support executesql(...,as_dict=True)"
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index b94f324b..be9ba86e 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1663,8 +1663,9 @@ class SQLFORM(FORM):
                 session.flash = T('not authorized')
                 redirect(referrer)
 
-        def gridbutton(buttonclass='buttonadd',buttontext='Add',
-                       buttonurl=url(args=[]),callback=None,delete=None,trap=True):
+        def gridbutton(buttonclass='buttonadd', buttontext='Add',
+                       buttonurl=url(args=[]), callback=None,
+                       delete=None, trap=True):
             if showbuttontext:
                 if callback:
                     return A(SPAN(_class=ui.get(buttonclass)),