Redo py3k branching from trunk again

svn path=/sandbox-branches/bhy/py3k/tools/; revision=52115