merge 2.7.3 release branch
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Mar 2012 01:22:45 +0000 (21:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Mar 2012 01:22:45 +0000 (21:22 -0400)

Trivial merge