From 15678d4c8602ca598bc8caec75826c5ccf6ec76a Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Tue, 7 Nov 2006 14:25:00 +0000
Subject: [PATCH] remove another broken property merge

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47259 65c4cc65-6c06-0410-ace0-fbb531ad65f3