From 4110af69768c996a7b2d6fbfcec280f2840bb3bf Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 22 Aug 2011 19:52:30 +0000
Subject: [PATCH] Fix merge 10 branch merge properties.

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