Merge
authorBrett Cannon <brett@python.org>
Fri, 13 Apr 2012 01:13:08 +0000 (21:13 -0400)
committerBrett Cannon <brett@python.org>
Fri, 13 Apr 2012 01:13:08 +0000 (21:13 -0400)

Trivial merge