From 65b42a1e8fe2edc03ccec0e37bc8a06cdd593675 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 2 May 2009 20:14:55 +0000
Subject: [PATCH] revert merge properties to something sane