diff -r 7aaae5466ad3 -r 677339529a53 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Wed Jul 06 19:25:53 2011 -0500
+++ b/mercurial/bookmarks.py	Tue Jul 05 10:13:54 2011 +0200
@@ -26,6 +26,9 @@
     bookmarks = {}
     try:
         for line in repo.opener('bookmarks'):
+            line = line.strip()
+            if ' ' not in line:
+                continue
             sha, refspec = line.strip().split(' ', 1)
             refspec = encoding.tolocal(refspec)
             try: