From 74423693fbc1b9077a395974e18763f95004c146 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Sep 2008 00:18:04 +0000
Subject: [PATCH] forgot to commit properties for last merge