Merged revisions 42783 via svnmerge from

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

........
r42783 | tilghman | 2006-09-11 16:47:23 -0500 (Mon, 11 Sep 2006) | 4 lines

When paging, only wait 5 seconds for the marked user to enter the conference.
After that, assume the paging already completed by the time the channel entered
the conference and drop back out.  (Issue 7275)

........


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