Merge
commit73869a6880b53567267225b0d555f898ba50c5a8
authorBarry Warsaw <barry@python.org>
Mon, 16 Nov 2009 04:30:21 +0000 (15 22:30 -0600)
committerBarry Warsaw <barry@python.org>
Mon, 16 Nov 2009 04:30:21 +0000 (15 22:30 -0600)
treebf61098b39df4544ce140dc7551fa9fb71fd386b
parente9c4ba828cea939e665cc91f46bbded8fcb887f0
parent759edbf3f4207a0d5654911cfa38150d2e7220b3
Merge