diff --git a/VERSION b/VERSION
index 22718795..97471f2c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.01.10.23.10
+Version 2.6.0-development+timestamp.2013.09.01.11.16.29
diff --git a/gluon/html.py b/gluon/html.py
index da092a33..1239b448 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -841,8 +841,8 @@ class DIV(XmlComponent):
                 c.latest = self.latest
                 c.session = self.session
                 c.formname = self.formname
-                c['hideerror'] = hideerror or \
-                        self.attributes.get('hideerror', False)
+                if not c.attributes.get('hideerror'):
+                    c['hideerror'] = hideerror or self.attributes.get('hideerror')
                 newstatus = c._traverse(status, hideerror) and newstatus
 
         # for input, textarea, select, option