Merge #12417 followup, also removing an extra docstring

author Éric Araujo <merwok@netwok.org>

Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)

committer Éric Araujo <merwok@netwok.org>

Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)
author Éric Araujo <merwok@netwok.org>
Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)
committer Éric Araujo <merwok@netwok.org>
Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)
diff --cc Doc/library/profile.rst
Simple merge
diff --cc Doc/license.rst
Simple merge
diff --cc Lib/pstats.py
Simple merge
author	Éric Araujo <merwok@netwok.org>
	Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)
committer	Éric Araujo <merwok@netwok.org>
	Thu, 28 Jul 2011 20:32:04 +0000 (22:32 +0200)
		1	2
Doc/library/profile.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/license.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/pstats.py	patch \|	diff1 \|	diff2 \|	blob \| history