From b612611b7f454b09689a5fb48c9b8b620ce303ff Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 2 May 2009 20:25:05 +0000
Subject: [PATCH] try to get merge props correct

-- 
2.50.1