Merged revisions 164877 via svnmerge from

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

................
r164877 | russell | 2008-12-16 15:12:49 -0600 (Tue, 16 Dec 2008) | 14 lines

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

........
r164876 | russell | 2008-12-16 15:10:44 -0600 (Tue, 16 Dec 2008) | 6 lines

Do not dereference the channel if AST_PBX_KEEPALIVE has been returned.

This is a bug I noticed while looking at the code for app_macro.  This return code
means that another thread has assumed ownership of the channel and it can no longer
be touched.  (I hate this return code with a passion, by the way.)

........

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

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