merging 3.0
commitfb690ba3605dcaceaa7d39e5de22d44e93d61dd4
authorBarry Warsaw <barry@python.org>
Fri, 22 Jun 2007 21:19:32 +0000 (22 17:19 -0400)
committerBarry Warsaw <barry@python.org>
Fri, 22 Jun 2007 21:19:32 +0000 (22 17:19 -0400)
tree48c2a25620761d72097a8586b455b2225ecb30ac
parentd629fe4305a062a62eb77d12d8847b7e405ff5e6
parent70d476211b3c10c5a6b084b775d4c8968fba7cb2
merging 3.0