diff -r cb9334cdff18 Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst	Sat Oct 01 00:12:20 2011 -0400
+++ b/Doc/distutils/apiref.rst	Sun Oct 02 08:42:08 2011 -0700
@@ -162,6 +162,8 @@
    The Extension class describes a single C or C++extension module in a setup
    script. It accepts the following keyword arguments in its constructor:
 
+   When declaring an extension that's part of a package, a directory with an :file:`__init__.py` file has be to be present, just like other packages.
+
    +------------------------+--------------------------------+---------------------------+
    | argument name          | value                          | type                      |
    +========================+================================+===========================+
@@ -281,7 +283,7 @@
 
    A :class:`Command` class (or rather, an instance of one of its subclasses)
    implement a single distutils command.
-
+   
 
 :mod:`distutils.ccompiler` --- CCompiler base class
 ===================================================
diff -r cb9334cdff18 Doc/distutils/setupscript.rst
--- a/Doc/distutils/setupscript.rst	Sat Oct 01 00:12:20 2011 -0400
+++ b/Doc/distutils/setupscript.rst	Sun Oct 02 08:42:08 2011 -0700
@@ -228,6 +228,7 @@
 Visual C++. These will be compiled to binary resource (:file:`.res`) files and
 linked into the executable.
 
+When declaring an extension that's part of a package, a directory with an :file:`init__.py` file has to be present, just like other packages.
 
 Preprocessor options
 --------------------
diff -r cb9334cdff18 Lib/difflib.py
--- a/Lib/difflib.py	Sat Oct 01 00:12:20 2011 -0400
+++ b/Lib/difflib.py	Sun Oct 02 08:42:08 2011 -0700
@@ -1713,8 +1713,7 @@
         self._linejunk = linejunk
         self._charjunk = charjunk
 
-    def make_file(self,fromlines,tolines,fromdesc='',todesc='',context=False,
-                  numlines=5):
+    def make_file(self,fromlines,tolines,fromdesc='',todesc='',context=False,numlines=5):
         """Returns HTML file of side by side comparison with change highlights
 
         Arguments:
diff -r cb9334cdff18 Objects/listobject.c
--- a/Objects/listobject.c	Sat Oct 01 00:12:20 2011 -0400
+++ b/Objects/listobject.c	Sun Oct 02 08:42:08 2011 -0700
@@ -1,7 +1,5 @@
 /* List object implementation */
 
-#include "Python.h"
-
 #ifdef STDC_HEADERS
 #include <stddef.h>
 #else