diff --git a/VERSION b/VERSION
index d063ca04..9df905ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.10.0-trunk+timestamp.2014.08.14.19.10.27
+Version 2.10.0-trunk+timestamp.2014.08.14.19.12.21
diff --git a/gluon/globals.py b/gluon/globals.py
index e77a0176..effcaf72 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -392,7 +392,7 @@ class Response(Storage):
         self.generic_patterns = ['*']                                          
         self.delimiters = ('{{','}}')
         self.formstyle = 'table2cols'
-        self.label_separator = ': '
+        self.form_label_separator = ': '
 
     def write(self, data, escape=True):
         if not escape:
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index feb98953..76f6d799 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1078,7 +1078,7 @@ class SQLFORM(FORM):
         else:
             self.id_field_name = table._primarykey[0]  # only works if one key
 
-        sep = separator or current.response.label_separator
+        sep = separator or current.response.form_label_separator
 
         extra_fields = extra_fields or []
         self.extra_fields = {}