From 93eb47fdbe256c6141c4de019f5e42fd4d226259 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 1 Dec 2006 20:24:32 +0000
Subject: [PATCH] erm, hmm...I typod a merge...that went...strangely

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