From: Éric Araujo <merwok@netwok.org>
Date: Sun, 29 May 2011 16:05:53 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.1rc2~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b8f6651f017cc380a13e095aae3bb2a1255b758;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

4b8f6651f017cc380a13e095aae3bb2a1255b758
diff --cc Doc/distutils/apiref.rst
index a7dc68e3a990,59f7b852092a..dc5bcf2ba0c4
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@@ -1942,6 -2006,6 +2006,7 @@@ This is described in more detail in :pe
  
  .. % todo
  
++
  :mod:`distutils.command.check` --- Check the meta-data of a package
  ===================================================================