Redo py3k branching from trunk again

svn path=; revision=52115