Blocked revisions 299531 via svnmerge

................
  r299531 | moy | 2010-12-22 21:53:02 -0500 (Wed, 22 Dec 2010) | 13 lines
  
  Merged revisions 299530 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r299530 | moy | 2010-12-22 21:28:37 -0500 (Wed, 22 Dec 2010) | 7 lines
    
    Enqueue AST_CONTROL_PROGRESS after AST_CONTROL_RINGING when MFC-R2 calls are accepted
    
    (closes issue #18438)
    Reported by: mariner7
    Tested by: moy
  ........
................


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