diff --git a/VERSION b/VERSION
index e40b5acc..5d141487 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-15 21:41:39) dev
+Version 2.00.0 (2012-07-16 13:13:40) dev
diff --git a/gluon/html.py b/gluon/html.py
index 9efd845b..36832f8e 100644
--- a/gluon/html.py
+++ b/gluon/html.py
@@ -455,7 +455,7 @@ def verifyURL(request, hmac_key=None, hash_vars=True, salt=None, user_signature=
 
     # return whether or not the signature in the request matched the one we just generated
     # (I.E. was the message the same as the one we originally signed)
-    
+
     return compare(original_sig, sig)
 
 URL.verify = verifyURL
@@ -1357,7 +1357,7 @@ class A(DIV):
                 (self['component'],self['target'] or '',d)
             self['_href'] = self['_href'] or '#null'
         elif self['callback']:
-            returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();" 
+            returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();"
             if d:
                 self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \
                     (self['callback'],self['target'] or '',d, returnfalse)
@@ -2147,6 +2147,8 @@ class MENU(DIV):
                 li = LI(DIV(name))
             elif link:
                 li = LI(A(name, _href=link))
+            elif not link and isinstance(name,A):
+                li = LI(name)
             else:
                 li = LI(A(name, _href='#',
                           _onclick='javascript:void(0);return false;'))
@@ -2166,7 +2168,7 @@ class MENU(DIV):
         if not select:
             select = SELECT(**self.attributes)
         for item in data:
-            if len(item) <= 4 or item[4] == True: 
+            if len(item) <= 4 or item[4] == True:
                 if item[2]:
                     select.append(OPTION(CAT(prefix, item[0]), _value=item[2], _selected=item[1]))
                     if len(item)>3 and len(item[3]):