Merged revisions 223804 via svnmerge from

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

........
  r223804 | jpeeler | 2009-10-12 18:12:50 -0500 (Mon, 12 Oct 2009) | 8 lines
  
  Ensure ringing continues for branched calls after progress is received
  
  While waiting for an answer, don't send progress for branched calls
  for which ringing was sent.
  
  (closes issue #15028)
  Reported by: fnordian
........


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