From a095bdc3b5cb4c2c425b2cbc8436ed3ca5e8b341 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Mon, 3 May 2010 17:49:52 +0000
Subject: [PATCH] Fix merge props

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