merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 12:57:56 +0000 (08:57 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 22 Mar 2012 12:57:56 +0000 (08:57 -0400)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge