Merged revisions 334157 via svnmerge from

Merged revisions 334157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334157 | mnicholson | 2011-08-31 13:53:40 -0500 (Wed, 31 Aug 2011) | 11 lines

  Merged revisions 334156 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r334156 | mnicholson | 2011-08-31 13:50:33 -0500 (Wed, 31 Aug 2011) | 4 lines

    Disable T.38 when we get a invite with image media port set to 0

    ASTERISK-17678
  ........
................

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