Merged revisions 217990 via svnmerge from

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

................
  r217990 | tilghman | 2009-09-10 18:54:51 -0500 (Thu, 10 Sep 2009) | 10 lines

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

  ........
    r217989 | tilghman | 2009-09-10 18:52:22 -0500 (Thu, 10 Sep 2009) | 3 lines

    Don't ring another channel, if there's not enough time for a queue member to answer.
    (Fixes AST-228)
  ........
................

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