branch merge
authorBrian Curtin <brian@python.org>
Mon, 7 Nov 2011 20:19:46 +0000 (14:19 -0600)
committerBrian Curtin <brian@python.org>
Mon, 7 Nov 2011 20:19:46 +0000 (14:19 -0600)

Trivial merge