tree a4a8218cb009a89157c51ed42e88ab4b2c0be7b5
parent 32a3b147b24847702c2fc7e7cf030b5f34921c2b
parent bf6bf4f8f2ca83ed60ef36c768deddea336f468c
author Benjamin Peterson <benjamin@python.org> 1331834464 -0500
committer Benjamin Peterson <benjamin@python.org> 1331834464 -0500

merge from 2.7 release branch