Merged revisions 329896 via svnmerge from

Merged revisions 329896 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329896 | seanbright | 2011-07-28 07:35:27 -0400 (Thu, 28 Jul 2011) | 9 lines

  Merged revisions 329895 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r329895 | seanbright | 2011-07-28 07:34:33 -0400 (Thu, 28 Jul 2011) | 2 lines

    Make the output of Externhost in 'sip show settings' more consistent.
  ........
................

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