branch merge.
authorBrian Curtin <brian@python.org>
Mon, 7 Nov 2011 22:09:54 +0000 (16:09 -0600)
committerBrian Curtin <brian@python.org>
Mon, 7 Nov 2011 22:09:54 +0000 (16:09 -0600)

Trivial merge