Merged revisions 78371 via svnmerge from

Merged revisions 78371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r78371 | russell | 2007-08-07 12:45:30 -0500 (Tue, 07 Aug 2007) | 12 lines

Merged revisions 78370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r78370 | russell | 2007-08-07 12:44:04 -0500 (Tue, 07 Aug 2007) | 4 lines

Revert patch committed for issue #9660.  It broke E&M trunks.
(closes issue #10360)
(closes issue #10364)

........

................

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