Merged revisions 289554 via svnmerge from

Merged revisions 289554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289554 | mnicholson | 2010-09-30 14:53:10 -0500 (Thu, 30 Sep 2010) | 11 lines

  Merged revisions 289553 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r289553 | mnicholson | 2010-09-30 14:51:27 -0500 (Thu, 30 Sep 2010) | 4 lines

    Properly handle channel allocation failures duing invites with replaces.

    ABE-2588
  ........
................

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