diff --git a/VERSION b/VERSION
index eae29d16..418bb045 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-05-03 19:00:32) dev
+Version 1.99.7 (2012-05-03 20:51:25) dev
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index 8e7c1e21..bb3aef12 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -44,7 +44,7 @@ viddler.com
 
 import re, cgi, sys
 from simplejson import loads
-from BeautifulSoup import BeautifulSoup
+from BeautifulSoup import BeautifulSoup, Comment
 import urllib
 import uuid
 
@@ -160,6 +160,8 @@ def expand_one(url,cdict):
 
 def expand_html(html,cdict=None):
     soup = BeautifulSoup(html)
+    comments = soup.findAll(text=lambda text:isinstance(text, Comment))
+    [comment.extract() for comment in comments]
     for txt in soup.findAll(text=True):
         if not txt.parent.name in ('a','script','pre','code','embed','object','audio','video'):
             ntxt = regex_link.sub(
diff --git a/gluon/tools.py b/gluon/tools.py
index bae3dff4..4d8c4188 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -2889,9 +2889,15 @@ class Auth(object):
         permission = self.settings.table_permission
         if group_id == 0:
             group_id = self.user_group()
-        id = permission.insert(group_id=group_id, name=name,
-                               table_name=str(table_name),
-                               record_id=long(record_id))
+        record = self.db(permission.group_id==group_id)(permission.name==name)\
+            (permission.table_name==str(table_name))\
+            (permission.record_id==long(record_id)).select().first()
+        if record:
+            id = record.id
+        else:
+            id = permission.insert(group_id=group_id, name=name,
+                                   table_name=str(table_name),
+                                   record_id=long(record_id))
         self.log_event(self.messages.add_permission_log,
                        dict(permission_id=id, group_id=group_id,
                             name=name, table_name=table_name,