Merge 3.1

diff --cc Tools/README
index 017e663c8b45f7f473780ac97644bd73d4d18f21,ae9b5927d84b881269bce43364c1a929f937a8a4..c1f89ba0cb7e02a3921a3f9072c6053286335c43
--- 1/Tools/README
--- 2/Tools/README
+++ b/Tools/README
@@@ -32,16 -22,12 +32,11 @@@ scripts         A number of useful sing
                  tabs and spaces, and 2to3, which converts Python 2 code
                  to Python 3 code.
  
 -unicode               Tools used to generate unicode database files for
 -              Python 2.0 (by Fredrik Lundh).
 +test2to3        A demonstration of how to use 2to3 transparently in setup.py.
  
 -webchecker    A link checker for web sites.
 +unicode         Tools for generating unicodedata and codecs from unicode.org
 +                and other mapping files (by Fredrik Lundh, Marc-Andre Lemburg
 +                and Martin von Loewis).
  
 -world         Script to take a list of Internet addresses and print
 -              out where in the world those addresses originate from,
 -              based on the top-level domain country code found in
 -              the address. 
 +unittestgui     A Tkinter based GUI test runner for unittest, with test
 +                discovery.
- 
- world           Script to take a list of Internet addresses and print
-                 out where in the world those addresses originate from,
-                 based on the top-level domain country code found in
-                 the address.