Merged revisions 378557 via svnmerge from

Merged revisions 378557 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r378557 | file | 2013-01-04 15:18:07 -0600 (Fri, 04 Jan 2013) | 11 lines

  Don't pass STUN packets through the SRTP unprotect function.

  (closes issue AST-1036)
  Reported by: jbigelow
  ........

  Merged revisions 378553 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 378555 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378560 65c4cc65-6c06-0410-ace0-fbb531ad65f3