From 4ee62f1bcd04a3d7bfb92268cf8444c06d01a758 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 30 Mar 2006 14:19:25 +0000
Subject: [PATCH] be more careful when merging in a branch with automerge
 properties :-(

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