Merged revisions 163089 via svnmerge from

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

................
  r163089 | tilghman | 2008-12-11 10:52:24 -0600 (Thu, 11 Dec 2008) | 13 lines

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

  ........
    r163088 | tilghman | 2008-12-11 10:51:27 -0600 (Thu, 11 Dec 2008) | 6 lines

    Don't wait forever, if there's a specified recording timeout.
    (closes issue #13885)
     Reported by: bamby
     Patches:
           res_agi.c.patch uploaded by bamby (license 430)
  ........
................

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