Merged revisions 261095 via svnmerge from

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

................
  r261095 | tilghman | 2010-05-04 18:51:52 -0500 (Tue, 04 May 2010) | 18 lines

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

  ........
    r261093 | tilghman | 2010-05-04 18:36:53 -0500 (Tue, 04 May 2010) | 7 lines

    Protect against overflow, when calculating how long to wait for a frame.

    (closes issue #17128)
     Reported by: under
     Patches:
           d.diff uploaded by under (license 914)
  ........
    r261094 | tilghman | 2010-05-04 18:47:08 -0500 (Tue, 04 May 2010) | 2 lines

    Add a tiny corner case to the previous commit
  ........
................

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