Merged revisions 214945 via svnmerge from

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

................
  r214945 | tilghman | 2009-08-31 11:18:33 -0500 (Mon, 31 Aug 2009) | 14 lines

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

  ........
    r214940 | tilghman | 2009-08-31 11:16:52 -0500 (Mon, 31 Aug 2009) | 7 lines

    Also unlock the "other" channel, when returning, due to glare.
    (closes issue #15787)
     Reported by: tim_ringenbach
     Patches:
           chan_local.diff uploaded by tim ringenbach (license 540)
     Tested by: tim_ringenbach
  ........
................

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