Merged revisions 273354 via svnmerge from

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

........
  r273354 | jpeeler | 2010-07-01 10:05:43 -0500 (Thu, 01 Jul 2010) | 12 lines
  
  Ensure channel placed in meetme in ringing state is properly hung up.
  
  An outgoing channel placed in meetme while still ringing which was then hung up
  would not exit meetme and the channel was not properly destroyed. Specifically
  checking for this scenario by looking at the appropriate control frames resolves
  the issue.
  
  (closes issue #15871)
  Reported by: Ivan
  Patches: 
        meetme_congestion_trunk_v2.patch uploaded by Ivan (license 229)
........


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