Merged revisions 314958 via svnmerge from

Merged revisions 314958 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r314958 | mnicholson | 2011-04-22 15:49:45 -0500 (Fri, 22 Apr 2011) | 17 lines

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

  ........
    r311203 | mnicholson | 2011-03-17 14:14:37 -0500 (Thu, 17 Mar 2011) | 4 lines

    Don't hold the pvt lock while streaming a file.

    ABE-2756
  ........
    r314908 | mnicholson | 2011-04-22 15:01:48 -0500 (Fri, 22 Apr 2011) | 4 lines

    Prevent the login thread and the app threads from using the asterisk channel at the same time.

    ABE-2756
  ........
................

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