Merged revisions 224567 via svnmerge from

Merged revisions 224567 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r224567 | file | 2009-10-19 16:49:09 -0300 (Mon, 19 Oct 2009) | 12 lines

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

  ........
    r224565 | file | 2009-10-19 16:47:50 -0300 (Mon, 19 Oct 2009) | 5 lines

    Do not attempt early media bridging (ie: direct RTP setup) if options are enabled that should prevent it.

    (closes issue #14763)
    Reported by: cupotka
  ........
................

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