From a24e82f0fdf810a63594a3a000c3a5c4908a862e Mon Sep 17 00:00:00 2001
From: Haoyu Bai <divinekid@gmail.com>
Date: Wed, 1 Apr 2009 16:55:33 +0000
Subject: [PATCH] Redo py3k branching from trunk again

[SVN r52115]