Merged revisions 333895 via svnmerge from

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

........
  r333895 | mnicholson | 2011-08-30 09:01:31 -0500 (Tue, 30 Aug 2011) | 6 lines
  
  Replaced FAXOPT(gwtimeout) with a second parameter to FAXOPT(gateway).
  
  Patch by: irroot
  Review: https://reviewboard.asterisk.org/r/1385/
  ASTERISK-18219
........


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