Merged revisions 370132 via svnmerge from

Merged revisions 370132 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r370132 | wdoekes | 2012-07-16 14:52:45 -0500 (Mon, 16 Jul 2012) | 11 lines

  Code cleanup and bugfix in chan_sip outboundproxy parsing.

  The bug was clearing the global outboundproxy when a peer-specific
  outboundproxy was bad. The cleanup reduces duplicate code.

  Review: https://reviewboard.asterisk.org/r/2034/
  Reviewed by: Mark Michelson
  ........

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

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