merge 11164

author Martin v. Löwis <martin@v.loewis.de>

Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)

committer Martin v. Löwis <martin@v.loewis.de>

Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)
author Martin v. Löwis <martin@v.loewis.de>
Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)
committer Martin v. Löwis <martin@v.loewis.de>
Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)
diff --cc Doc/library/modulefinder.rst
Simple merge
diff --cc Doc/library/xml.dom.minidom.rst
Simple merge
diff --cc Doc/library/xml.dom.rst
Simple merge
diff --cc Lib/modulefinder.py
Simple merge
diff --cc Lib/test/test_minidom.py
Simple merge
diff --cc Lib/test/test_sax.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Martin v. Löwis <martin@v.loewis.de>
	Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)
committer	Martin v. Löwis <martin@v.loewis.de>
	Mon, 9 May 2011 06:10:38 +0000 (08:10 +0200)
		1	2
Doc/library/modulefinder.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/xml.dom.minidom.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Doc/library/xml.dom.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/modulefinder.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_minidom.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_sax.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history