Merged revisions 98164 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r98164 | tilghman | 2008-01-11 09:52:31 -0600 (Fri, 11 Jan 2008) | 2 lines

Back out changes from revision 97077, since it wasn't perfect

........


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