Merged revisions 119071 via svnmerge from

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

........
r119071 | tilghman | 2008-05-29 15:24:11 -0500 (Thu, 29 May 2008) | 7 lines

Call waiting tone occurs too often, because it's getting serviced by both
subchannels.
(closes issue #11354)
 Reported by: cahen
 Patches:
       20080512__bug11354.diff.txt uploaded by Corydon76 (license 14)

........

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