Merged revisions 295670 via svnmerge from

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

........
  r295670 | bbryant | 2010-11-19 16:40:21 -0500 (Fri, 19 Nov 2010) | 8 lines
  
  Patch for deadlock from ordering issue between channel/queue locks in app_queue
  (set_queue_variables).
  
  (closes issue #18031)
  Reported by: rain
  
  Review: https://reviewboard.asterisk.org/r/1018/
........


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