From 2915f878200728f75d092aa940b82811bb0bc82b 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]