From 61151e983c72813575c1fa3dce25644ffe9f960a Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Tue, 21 Sep 2010 00:00:41 +0000
Subject: [PATCH] Add merge properties back.

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