From 4731db7a16490e3a06ad06080b5261a90fe261d9 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 22 Aug 2011 19:41:03 +0000
Subject: [PATCH] Fix merge property.

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