null merge from 2.6
authorBarry Warsaw <barry@python.org>
Thu, 23 Feb 2012 16:03:31 +0000 (11:03 -0500)
committerBarry Warsaw <barry@python.org>
Thu, 23 Feb 2012 16:03:31 +0000 (11:03 -0500)
commit62cc44db0c70c3b487655f8940d2d07a0ac01ee6
tree169551a8adc9a3b8840bcf7695576f745021e7b1
parent0473486d7faea601560bf54ad633483b9f132de4
parent2593eac34e45d9f6160419ec50dbbe4452bca1fb
null merge from 2.6