From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 20 Sep 2006 23:02:25 +0000 (+0000)
Subject: this has been manually merged
X-Git-Tag: 1.6.0-beta1~3^2~4705
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e4853780c482ae5de2bbba5a41c800e69d9d1c2;p=thirdparty%2Fasterisk.git

this has been manually merged


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