Merged revisions 70445 via svnmerge from

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

................
r70445 | tilghman | 2007-06-20 14:29:23 -0500 (Wed, 20 Jun 2007) | 10 lines

Merged revisions 70444 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r70444 | tilghman | 2007-06-20 14:25:54 -0500 (Wed, 20 Jun 2007) | 2 lines

Issue 9997 - Timelimit times out the wrong channel

........

................


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