From 1b4e2a5d6bc7729ea4d26d7212a09afc5e0f044e Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 4 Feb 2009 23:44:56 +0000
Subject: [PATCH] I messed up and accidentally reverted the trunk-merged prop
 before committing 173546. Added it manually.

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