merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:57:26 +0000 (07:57 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Sep 2011 11:57:26 +0000 (07:57 -0400)
commit7f5556095eed7383e98c24766aa302c5e473abc1
tree62ef86cf5bd5c70dc8a48aa56f6066007529b656
parentf22913b8c39f1053c291c96cf3016cabad60bbd4
parentd88d9836c541258a46acb153cd488de2a04b60db
merge heads