trunk merge
authorBarry Warsaw <barry@python.org>
Thu, 21 Nov 2013 23:57:41 +0000 (18:57 -0500)
committerBarry Warsaw <barry@python.org>
Thu, 21 Nov 2013 23:57:41 +0000 (18:57 -0500)
commit99fc416b238a486bb9735e36cd374bf00d4af0c8
tree133eff0fc8d930e3a7aea068480e33140d4ca37c
parent197a7702310e6a6cf67b658c66dd3b43ee12439b
parentba723200ce3effa5bea05a10fd01e3bb89ea8da7
trunk merge