merge with stable

hgext/bugzilla.py

@@ -232,7 +232,7 b' are sent to the Bugzilla email address'
     bzurl=http://my-project.org/bugzilla
     user=[e-mail]
     password=plugh
-    version=xmlrpc
+    version=xmlrpc+email
     bzemail=[e-mail]
     template=Changeset {node|short} in {root|basename}.
              {hgweb}/{webroot}/rev/{node|short}\\n

mercurial/bookmarks.py

@@ -164,6 +164,9 b' def deletedivergent(repo, deletefrom, bm'
     marks = repo._bookmarks
     divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
     for mark in divergent:
+        if mark == '@' or '@' not in mark:
+            # can't be divergent by definition
+            continue
         if mark and marks[mark] in deletefrom:
             if mark != bm:
                 del marks[mark]