From 4d49cdf23e598e25519aa7b6a6a1516dcf84ff5f Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 4 Mar 2008 16:56:37 +0000
Subject: [PATCH] set up trunk-merged property

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