Recorded merge of revisions 211112 via svnmerge from

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

........
  r211112 | russell | 2009-08-07 15:11:31 -0500 (Fri, 07 Aug 2009) | 4 lines
  
  Resolve a deadlock involving app_chanspy and masquerades.
  
  (ABE-1936)
........


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