--- /usr/local/lib/python2.4/ConfigParser.py	2006-06-27 11:04:21.000000000 -0400
+++ ./ConfigParser.py	2006-07-18 17:08:53.992549016 -0400
@@ -404,7 +404,7 @@
         r'\]'                                 # ]
         )
     OPTCRE = re.compile(
-        r'(?P<option>[^:=\s][^:=]*)'          # very permissive!
+        r'\s*(?P<option>[^:=\s][^:=]*)'       # very permissive!
         r'\s*(?P<vi>[:=])\s*'                 # any number of space/tab,
                                               # followed by separator
                                               # (either : or =), followed
@@ -432,7 +432,7 @@
                 break
             lineno = lineno + 1
             # comment or blank line?
-            if line.strip() == '' or line[0] in '#;':
+            if line.strip() == '' or line.strip()[0] in '#;':
                 continue
             if line.split(None, 1)[0].lower() == 'rem' and line[0] in "rR":
                 # no leading whitespace