Merged revisions 378783,378789-378790 via svnmerge from

Merged revisions 378783,378789-378790 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r378783 | dlee | 2013-01-09 14:30:33 -0600 (Wed, 09 Jan 2013) | 14 lines

  Fix end condition in ast_rtp_lookup_mime_multiple2.

  The erroneous end condition would never include the AST_RTP_CISCO_DTMF flag
  in the debug output.

  (closes issue ASTERISK-20772)
  Reported by: Xavier Hienne
  ........

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

  Merged revisions 378780 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r378789 | rmudgett | 2013-01-09 14:56:23 -0600 (Wed, 09 Jan 2013) | 4 lines

  * Found some more places to use ast_channel_lock_both().

  * Minor optimization in ast_rtp_instance_early_bridge().
................
  r378790 | rmudgett | 2013-01-09 15:14:39 -0600 (Wed, 09 Jan 2013) | 4 lines

  * Whitespace changes.

  * Made ast_test_init() match its prototype.
................

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