Merged revisions 205770 via svnmerge from

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

........
  r205770 | kpfleming | 2009-07-10 10:28:11 -0500 (Fri, 10 Jul 2009) | 12 lines

  Fix some remaining T.38 negotiation problems in app_fax.

  Revision 205696 did not quite fix all the issues with the T.38 negotiation
  changes and app_fax; this patch corrects them, along with a couple of other
  minor issues.

  (closes issue #15480)
  Reported by: dimas
  Patches:
        test2-15480.patch uploaded by dimas (license 88)
........

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