From 529f64c60f23846c296e4ffe0808c78cf408e42e Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Tue, 31 Aug 2004 13:40:05 +0000
Subject: [PATCH] More merge property mucking.

-- 
2.47.3