merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 19:00:35 +0000 (15:00 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 19:00:35 +0000 (15:00 -0400)

Trivial merge