[Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1

[brian.curtin]

http://hg.python.org/cpython/rev/eecde4602c5c
changeset:   69336:eecde4602c5c
branch:      3.2
parent:      69332:83e4765ec4cb
parent:      69335:135cf9104f56
user:        Brian Curtin <brian at python.org>
date:        Wed Apr 13 16:11:37 2011 -0500
summary:
  Merge 3.1

files:
  Tools/README |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Tools/README b/Tools/README
--- a/Tools/README
+++ b/Tools/README
@@ -40,8 +40,3 @@
 
 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.

-- 
Repository URL: http://hg.python.org/cpython