tree 9f0d4b990bb571dc46e133e2350bbf332c0088a6
parent ae2af38f3d605c1e347ad4d1fd7e8bcb43435531
parent 6e0a8b8ab63cc60b39af4387b99f448b0cf137ad
author Georg Brandl <georg@python.org> 1299354050 +0100
committer Georg Brandl <georg@python.org> 1299354050 +0100

Merge tags from 2.5.