diff --git a/ChangeLog b/ChangeLog
index 68648ec..cf6915e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-23  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	reviewed by: <delete if not using a buddy>
+	patch by: <delete if not someone else's patch>
+
+	* morituri/common/common.py:
+	* morituri/image/toc.py:
+
 2009-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/checksum.py:
diff --git a/morituri/common/common.py b/morituri/common/common.py
index d90b2c8..7c7896a 100644
--- a/morituri/common/common.py
+++ b/morituri/common/common.py
@@ -31,13 +31,13 @@ FRAMES_PER_SECOND = 75
 
 def msfToFrames(msf):
     """
-    Converts a string value in MM:SS:FF to frames
+    Converts a string value in MM:SS:FF to frames.
 
-    @param msf:
+    @param msf: the MM:SS:FF value to convert
     @type  msf: str
 
-    @rtype int
-    @returns number of frames
+    @rtype:   int
+    @returns: number of frames
     """
     if not ':' in msf:
         return int(msf)
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index dd75cea..f1abefb 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -92,9 +92,13 @@ class TocFile(object, log.Loggable):
         self.table = table.Table()
 
     def parse(self):
-        state = 'HEADER'
+        # these two objects start as None then get set as real objects,
+        # so no need to complain about them here
+        __pychecker__ = 'no-objattrs'
         currentFile = None
         currentTrack = None
+
+        state = 'HEADER'
         counter = 0
         trackNumber = 0
         indexNumber = 0