Blocked revisions 220907 via svnmerge

........
  r220907 | mnicholson | 2009-09-29 15:14:29 -0500 (Tue, 29 Sep 2009) | 10 lines

  Avoid a deadlock in chanspy, just in case the spyee is masqueraded and chanspy_ds_chan_fixup() is called with the channel locked.

  (closes issue #15965)
  Reported by: atis
  Patches:
        chanspy-deadlock-fix1.diff uploaded by mnicholson (license 96)
  Tested by: atis
........

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