Merged revisions 337261 via svnmerge from

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

........
  r337261 | irroot | 2011-09-21 12:42:06 +0200 (Wed, 21 Sep 2011) | 10 lines

  Adds a timeout argument to app_originate

  the default is 30s this will be used if the timout supplied is invalid or
  no timeout is supplied.

  Contributed by: jacco (thank you for the work)

  Review: https://reviewboard.asterisk.org/r/1310/
........

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