From c7f3a4b899346b15946ba964e8f0806f51dbcba2 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 20 Sep 2006 21:00:58 +0000
Subject: [PATCH] set up merge tracking from 1.4 branch

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@374 2fbb986a-6c06-0410-b554-c9c1f0a7f128