From 2e4853780c482ae5de2bbba5a41c800e69d9d1c2 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 20 Sep 2006 23:02:25 +0000
Subject: [PATCH] this has been manually merged

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